Index: configure.ac =================================================================== RCS file: /cvs/gnome/gedit/configure.ac,v retrieving revision 1.37 diff -u -p -u -p -r1.37 configure.ac --- configure.ac 13 Jul 2006 13:17:19 -0000 1.37 +++ configure.ac 17 Jul 2006 14:49:00 -0000 @@ -93,7 +93,7 @@ dnl ==================================== PKG_CHECK_MODULES(GEDIT, [ glib-2.0 >= 2.8.0 gtk+-2.0 >= 2.8.0 - gtksourceview-1.0 >= 1.2.0 + gtksourceview-2.0 >= 2.0.0 libgnomeui-2.0 >= 2.13.0 libglade-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.6.0 Index: gedit/Makefile.am =================================================================== RCS file: /cvs/gnome/gedit/gedit/Makefile.am,v retrieving revision 1.120 diff -u -p -u -p -r1.120 Makefile.am --- gedit/Makefile.am 13 Jun 2006 18:55:30 -0000 1.120 +++ gedit/Makefile.am 17 Jul 2006 14:49:00 -0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = dialogs recent-files -bin_PROGRAMS = gedit +bin_PROGRAMS = gedit2 noinst_LTLIBRARIES = libgedit.la @@ -27,10 +27,10 @@ INCLUDES += \ $(AM_CFLAGS) endif -gedit_SOURCES = gedit.c -gedit_LDADD = libgedit.la $(GEDIT_LIBS) +gedit2_SOURCES = gedit.c +gedit2_LDADD = libgedit.la $(GEDIT_LIBS) -gedit_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" +gedit2_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*" @@ -92,8 +92,6 @@ INST_H_FILES = \ gedit-plugin.h \ gedit-prefs-manager-app.h \ gedit-prefs-manager.h \ - gedit-print.h \ - gedit-print-job-preview.h \ gedit-progress-message-area.h \ gedit-recent.h \ gedit-statusbar.h \ @@ -141,7 +139,6 @@ libgedit_la_SOURCES = \ gedit-prefs-manager-app.c \ gedit-prefs-manager.c \ gedit-prefs-manager-private.h \ - gedit-print.c \ gedit-print-job-preview.c \ gedit-progress-message-area.c \ gedit-recent.c \ Index: gedit/gedit-commands-file-print.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-commands-file-print.c,v retrieving revision 1.3 diff -u -p -u -p -r1.3 gedit-commands-file-print.c --- gedit/gedit-commands-file-print.c 29 May 2006 10:14:28 -0000 1.3 +++ gedit/gedit-commands-file-print.c 17 Jul 2006 14:49:00 -0000 @@ -48,144 +48,17 @@ void _gedit_cmd_file_page_setup (GtkAction *action, GeditWindow *window) { - gedit_debug (DEBUG_COMMANDS); - - gedit_show_page_setup_dialog (GTK_WINDOW (window)); } void _gedit_cmd_file_print_preview (GtkAction *action, GeditWindow *window) { - GeditDocument *doc; - GeditTab *tab; - GeditPrintJob *pjob; - GtkTextIter start; - GtkTextIter end; - - gedit_debug (DEBUG_COMMANDS); - - tab = gedit_window_get_active_tab (window); - if (tab == NULL) - return; - - doc = gedit_tab_get_document (tab); - - pjob = gedit_print_job_new (doc); - - gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (doc) , &start, &end); - - _gedit_tab_print_preview (tab, pjob, &start, &end); - g_object_unref (pjob); -} - -static void -print_dialog_response_cb (GtkWidget *dialog, - gint response, - GeditPrintJob *pjob) -{ - GtkTextIter start; - GtkTextIter end; - gint line_start; - gint line_end; - GnomePrintRangeType range_type; - GtkTextBuffer *buffer; - GeditTab *tab; - - gedit_debug (DEBUG_COMMANDS); - - range_type = gnome_print_dialog_get_range (GNOME_PRINT_DIALOG (dialog)); - - buffer = GTK_TEXT_BUFFER ( - gtk_source_print_job_get_buffer (GTK_SOURCE_PRINT_JOB (pjob))); - - gtk_text_buffer_get_bounds (buffer, &start, &end); - - tab = gedit_tab_get_from_document (GEDIT_DOCUMENT (buffer)); - - switch (range_type) - { - case GNOME_PRINT_RANGE_ALL: - break; - - case GNOME_PRINT_RANGE_SELECTION: - gtk_text_buffer_get_selection_bounds (buffer, - &start, - &end); - break; - - case GNOME_PRINT_RANGE_RANGE: - gnome_print_dialog_get_range_page (GNOME_PRINT_DIALOG (dialog), - &line_start, - &line_end); - - gtk_text_iter_set_line (&start, line_start - 1); - gtk_text_iter_set_line (&end, line_end - 1); - - gtk_text_iter_forward_to_line_end (&end); - - break; - - default: - g_return_if_reached (); - } - - switch (response) - { - case GNOME_PRINT_DIALOG_RESPONSE_PRINT: - gedit_debug_message (DEBUG_PRINT, - "Print button pressed."); - - _gedit_tab_print (tab, pjob, &start, &end); - - break; - - case GNOME_PRINT_DIALOG_RESPONSE_PREVIEW: - gedit_debug_message (DEBUG_PRINT, - "Preview button pressed."); - - _gedit_tab_print_preview (tab, pjob, &start, &end); - - break; - } - - g_object_unref (pjob); - gtk_widget_destroy (dialog); } void _gedit_cmd_file_print (GtkAction *action, GeditWindow *window) { - GeditDocument *doc; - GeditPrintJob *pjob; - GtkWidget *print_dialog; - GtkWindowGroup *wg; - - gedit_debug (DEBUG_COMMANDS); - - doc = gedit_window_get_active_document (window); - if (doc == NULL) - return; - - pjob = gedit_print_job_new (doc); - - print_dialog = gedit_print_dialog_new (pjob); - - wg = gedit_window_get_group (window); - - gtk_window_group_add_window (wg, - GTK_WINDOW (print_dialog)); - - gtk_window_set_transient_for (GTK_WINDOW (print_dialog), - GTK_WINDOW (window)); - gtk_window_set_modal (GTK_WINDOW (print_dialog), TRUE); - - g_signal_connect (print_dialog, - "response", - G_CALLBACK (print_dialog_response_cb), - pjob); - - gtk_widget_show (print_dialog); } Index: gedit/gedit-languages-manager.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-languages-manager.c,v retrieving revision 1.11 diff -u -p -u -p -r1.11 gedit-languages-manager.c --- gedit/gedit-languages-manager.c 26 Apr 2006 18:27:03 -0000 1.11 +++ gedit/gedit-languages-manager.c 17 Jul 2006 14:49:00 -0000 @@ -119,6 +119,7 @@ gdk_color_to_string (GdkColor color) color.blue); } +#if 0 static gchar * tag_style_to_string (const GtkSourceTagStyle *style) { @@ -199,40 +200,12 @@ error: return NULL; } - +#endif void gedit_language_set_tag_style (GtkSourceLanguage *language, const gchar *tag_id, - const GtkSourceTagStyle *style) + const void *style) { - gchar *key; - - g_return_if_fail (gconf_client != NULL); - - key = get_gconf_key (language, tag_id); - g_return_if_fail (key != NULL); - - if (style == NULL) - { - gconf_client_unset (gconf_client, key, NULL); - - /* Make the changes locally */ - gtk_source_language_set_tag_style (language, tag_id, NULL); - } - else - { - gchar *value; - - value = tag_style_to_string (style); - g_return_if_fail (value != NULL); - - gconf_client_set_string (gconf_client, key, value, NULL); - - /* Make the changes locally */ - gtk_source_language_set_tag_style (language, tag_id, style); - } - - g_free (key); } static GSList *initialized_languages = NULL; @@ -240,71 +213,7 @@ static GSList *initialized_languages = N void gedit_language_init_tag_styles (GtkSourceLanguage *language) { - GSList *l; - GSList *tags; - - l = initialized_languages; - - while (l != NULL) - { - if (l->data == language) - /* Already initialized */ - return; - - l = g_slist_next (l); - } - - tags = gtk_source_language_get_tags (language); - - l = tags; - - while (l != NULL) - { - GtkSourceTag *tag; - gchar *id; - gchar *key; - gchar *value; - - tag = GTK_SOURCE_TAG (l->data); - - id = gtk_source_tag_get_id (tag); - g_return_if_fail (id != NULL); - - key = get_gconf_key (language, id); - g_return_if_fail (key != NULL); - - value = gconf_client_get_string (gconf_client, key, NULL); - - if (value != NULL) - { - GtkSourceTagStyle *style; - - style = string_to_tag_style (value); - if (style != NULL) - { - gtk_source_language_set_tag_style (language, id, style); - - gtk_source_tag_style_free (style); - - } - else - { - g_warning ("gconf key %s contains an invalid value", key); - } - - g_free (value); - } - - g_free (id); - g_free (key); - - l = g_slist_next (l); - } - - g_slist_foreach (tags, (GFunc)g_object_unref, NULL); - g_slist_free (tags); - initialized_languages = g_slist_prepend (initialized_languages, language); } static gint Index: gedit/gedit-languages-manager.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-languages-manager.h,v retrieving revision 1.6 diff -u -p -u -p -r1.6 gedit-languages-manager.h --- gedit/gedit-languages-manager.h 27 Jan 2006 11:51:11 -0000 1.6 +++ gedit/gedit-languages-manager.h 17 Jul 2006 14:49:02 -0000 @@ -44,7 +44,7 @@ GtkSourceLanguage *gedit_languages_man void gedit_language_set_tag_style (GtkSourceLanguage *language, const gchar *tag_id, - const GtkSourceTagStyle *style); + const void *style); void gedit_language_init_tag_styles (GtkSourceLanguage *language); Index: gedit/gedit-print.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-print.h,v retrieving revision 1.9 diff -u -p -u -p -r1.9 gedit-print.h --- gedit/gedit-print.h 12 Dec 2005 17:27:55 -0000 1.9 +++ gedit/gedit-print.h 17 Jul 2006 14:49:02 -0000 @@ -33,7 +33,7 @@ #define __GEDIT_PRINT_H__ #include -#include +//#include #include G_BEGIN_DECLS @@ -56,7 +56,8 @@ typedef struct _GeditPrintJob GeditPrint struct _GeditPrintJob { - GtkSourcePrintJob parent; + GObject a; +// GtkSourcePrintJob parent; }; /* @@ -66,22 +67,23 @@ typedef struct _GeditPrintJobClass Gedit struct _GeditPrintJobClass { - GtkSourcePrintJobClass parent_class; + GObjectClass a; +// GtkSourcePrintJobClass parent_class; }; /* * Public methods */ -GType gedit_print_job_get_type (void) G_GNUC_CONST; +GType gedit_print_job_get_type (void) {return 87625;} -GeditPrintJob *gedit_print_job_new (GeditDocument *doc); +GeditPrintJob *gedit_print_job_new (GeditDocument *doc) {return NULL;} -void gedit_print_job_save_config (GeditPrintJob *job); +void gedit_print_job_save_config (GeditPrintJob *job) {}; /* GeditPrintDialog (it is a GnomePrintDialog) */ -GtkWidget *gedit_print_dialog_new (GeditPrintJob *job); +GtkWidget *gedit_print_dialog_new (GeditPrintJob *job) {return NULL;}; G_END_DECLS Index: gedit/gedit-tab.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-tab.c,v retrieving revision 1.13 diff -u -p -u -p -r1.13 gedit-tab.c --- gedit/gedit-tab.c 15 Jun 2006 14:09:55 -0000 1.13 +++ gedit/gedit-tab.c 17 Jul 2006 14:49:02 -0000 @@ -64,7 +64,7 @@ struct _GeditTabPrivate GtkWidget *message_area; GtkWidget *print_preview; - GeditPrintJob *print_job; +// GeditPrintJob *print_job; /* tmp data for saving */ gchar *tmp_save_uri; @@ -228,7 +228,8 @@ static void gedit_tab_finalize (GObject *object) { GeditTab *tab = GEDIT_TAB (object); - + +#if 0 if (tab->priv->print_job != NULL) { gedit_debug_message (DEBUG_TAB, "Cancelling printing"); @@ -236,7 +237,7 @@ gedit_tab_finalize (GObject *object) gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); g_object_unref (tab->priv->print_job); } - +#endif if (tab->priv->timer != NULL) g_timer_destroy (tab->priv->timer); @@ -1994,9 +1995,9 @@ set_print_preview (GeditTab *tab, GtkWi #define MIN_PAGES 15 static void -print_page_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +print_page_cb (void *pjob, GeditTab *tab) { - gchar *str; +/* gchar *str; gint page_num; gint total; @@ -2021,11 +2022,13 @@ print_page_cb (GtkSourcePrintJob *pjob, gedit_progress_message_area_set_fraction (GEDIT_PROGRESS_MESSAGE_AREA (tab->priv->message_area), 1.0 * page_num / total); +*/ } static void -preview_finished_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +preview_finished_cb (void *pjob, GeditTab *tab) { +#if 0 GnomePrintJob *gjob; GtkWidget *preview = NULL; @@ -2043,11 +2046,13 @@ preview_finished_cb (GtkSourcePrintJob * g_object_unref (pjob); gedit_tab_set_state (tab, GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW); +#endif } static void -print_finished_cb (GtkSourcePrintJob *pjob, GeditTab *tab) +print_finished_cb (void *pjob, GeditTab *tab) { +#if 0 GnomePrintJob *gjob; g_return_if_fail (GEDIT_IS_PROGRESS_MESSAGE_AREA (tab->priv->message_area)); @@ -2063,6 +2068,7 @@ print_finished_cb (GtkSourcePrintJob *pj g_object_unref (pjob); gedit_tab_set_state (tab, GEDIT_TAB_STATE_NORMAL); +#endif } static void @@ -2072,8 +2078,8 @@ print_cancelled (GeditMessageArea *area, { g_return_if_fail (GEDIT_IS_PROGRESS_MESSAGE_AREA (tab->priv->message_area)); - gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); - g_object_unref (tab->priv->print_job); +// gtk_source_print_job_cancel (GTK_SOURCE_PRINT_JOB (tab->priv->print_job)); +// g_object_unref (tab->priv->print_job); set_message_area (tab, NULL); /* destroy the message area */ @@ -2106,10 +2112,11 @@ show_printing_message_area (GeditTab void _gedit_tab_print (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end) { +#if 0 GeditDocument *doc; g_return_if_fail (GEDIT_IS_TAB (tab)); @@ -2147,14 +2154,16 @@ _gedit_tab_print (GeditTab *tab, g_warning ("Async print preview failed"); g_object_unref (pjob); } +#endif } void _gedit_tab_print_preview (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end) { +#if 0 GeditDocument *doc; g_return_if_fail (GEDIT_IS_TAB (tab)); @@ -2190,6 +2199,7 @@ _gedit_tab_print_preview (GeditTab g_warning ("Async print preview failed"); g_object_unref (pjob); } +#endif } void Index: gedit/gedit-tab.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-tab.h,v retrieving revision 1.4 diff -u -p -u -p -r1.4 gedit-tab.h --- gedit/gedit-tab.h 19 Feb 2006 18:01:09 -0000 1.4 +++ gedit/gedit-tab.h 17 Jul 2006 14:49:02 -0000 @@ -35,7 +35,6 @@ #include #include -#include G_BEGIN_DECLS @@ -147,11 +146,11 @@ void _gedit_tab_save_as (GeditTab const gchar *uri, const GeditEncoding *encoding); void _gedit_tab_print (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end); void _gedit_tab_print_preview (GeditTab *tab, - GeditPrintJob *pjob, + void *pjob, GtkTextIter *start, GtkTextIter *end); void _gedit_tab_mark_for_closing (GeditTab *tab); Index: gedit/gedit.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit.c,v retrieving revision 1.140 diff -u -p -u -p -r1.140 gedit.c --- gedit/gedit.c 29 May 2006 10:14:28 -0000 1.140 +++ gedit/gedit.c 17 Jul 2006 14:49:02 -0000 @@ -463,7 +463,7 @@ main (int argc, char *argv[]) gedit_debug_message (DEBUG_APP, "Create bacon connection"); - connection = bacon_message_connection_new ("gedit"); + connection = bacon_message_connection_new ("gedit-gsv2"); if (connection != NULL) { Index: gedit/dialogs/gedit-preferences-dialog.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-preferences-dialog.c,v retrieving revision 1.74 diff -u -p -u -p -r1.74 gedit-preferences-dialog.c --- gedit/dialogs/gedit-preferences-dialog.c 12 Dec 2005 17:27:56 -0000 1.74 +++ gedit/dialogs/gedit-preferences-dialog.c 17 Jul 2006 14:49:04 -0000 @@ -37,7 +37,7 @@ #include #include -#include +//#include #include #include @@ -771,6 +771,7 @@ static void language_changed_cb (GtkComboBox *combobox, GeditPreferencesDialog *dlg) { +#if 0 const GSList *languages; GSList *tags, *l; GtkSourceLanguage *lang; @@ -815,6 +816,7 @@ language_changed_cb (GtkComboBox *combob path = gtk_tree_path_new_first (); gtk_tree_view_set_cursor (GTK_TREE_VIEW (dlg->priv->tags_treeview), path, NULL, FALSE); gtk_tree_path_free (path); +#endif } static GtkSourceLanguage * @@ -831,9 +833,11 @@ get_selected_language (GeditPreferencesD return lang; } +#if 0 static GtkSourceTagStyle * get_selected_style (GeditPreferencesDialog *dlg) { + GtkTreePath *path; GtkTreeIter iter; gchar *id; @@ -1094,7 +1098,7 @@ reset_button_clicked (GtkButton styles_cb (NULL, dlg); } - +#endif static void select_default_language (GeditPreferencesDialog *dlg) { @@ -1168,11 +1172,11 @@ setup_syntax_highlighting_page (GeditPre "changed", G_CALLBACK (language_changed_cb), dlg); - g_signal_connect (dlg->priv->tags_treeview, +/* g_signal_connect (dlg->priv->tags_treeview, "cursor-changed", G_CALLBACK (styles_cb), dlg); - +*/ languages = gedit_languages_manager_get_available_languages_sorted ( gedit_get_languages_manager ()); @@ -1191,7 +1195,7 @@ setup_syntax_highlighting_page (GeditPre gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->hl_mode_combobox), 0); - g_signal_connect (dlg->priv->enable_syntax_hl_checkbutton, +/* g_signal_connect (dlg->priv->enable_syntax_hl_checkbutton, "toggled", G_CALLBACK (enable_syntax_hl_button_toggled), dlg); @@ -1231,6 +1235,7 @@ setup_syntax_highlighting_page (GeditPre "clicked", G_CALLBACK (reset_button_clicked), dlg); + */ } static void Index: plugins/spell/gedit-automatic-spell-checker.c =================================================================== RCS file: /cvs/gnome/gedit/plugins/spell/gedit-automatic-spell-checker.c,v retrieving revision 1.11 diff -u -p -u -p -r1.11 gedit-automatic-spell-checker.c --- plugins/spell/gedit-automatic-spell-checker.c 12 Dec 2005 17:28:02 -0000 1.11 +++ plugins/spell/gedit-automatic-spell-checker.c 17 Jul 2006 14:49:04 -0000 @@ -656,18 +656,6 @@ popup_menu_event (GtkTextView *view, Ged return FALSE; } -static void -tag_table_changed (GtkSourceTagTable *table, - GeditAutomaticSpellChecker *spell) -{ - g_return_if_fail (spell->tag_highlight != NULL); - g_return_if_fail (GTK_TEXT_BUFFER (spell->doc)->tag_table != NULL); - g_return_if_fail (GTK_IS_SOURCE_TAG_TABLE (GTK_TEXT_BUFFER (spell->doc)->tag_table)); - - gtk_text_tag_set_priority (spell->tag_highlight, - gtk_text_tag_table_get_size (GTK_TEXT_BUFFER (spell->doc)->tag_table) - 1); -} - GeditAutomaticSpellChecker * gedit_automatic_spell_checker_new (GeditDocument *doc, GeditSpellChecker *checker) { @@ -744,15 +732,11 @@ gedit_automatic_spell_checker_new (Gedit NULL); g_return_val_if_fail (GTK_TEXT_BUFFER (doc)->tag_table != NULL, NULL); - g_return_val_if_fail (GTK_IS_SOURCE_TAG_TABLE (GTK_TEXT_BUFFER (doc)->tag_table), NULL); +// g_return_val_if_fail (GTK_IS_SOURCE_TAG_TABLE (GTK_TEXT_BUFFER (doc)->tag_table), NULL); gtk_text_tag_set_priority (spell->tag_highlight, gtk_text_tag_table_get_size (GTK_TEXT_BUFFER (doc)->tag_table) - 1); - g_signal_connect (G_OBJECT (GTK_TEXT_BUFFER (doc)->tag_table), - "changed", - G_CALLBACK (tag_table_changed), - spell); /* we create the mark here, but we don't use it until text is * inserted, so we don't really care where iter points. */