Index: configure.ac =================================================================== RCS file: /cvs/gnome/gedit/configure.ac,v retrieving revision 1.46 diff -u -p -u -p -r1.46 configure.ac --- configure.ac 26 Aug 2006 16:10:03 -0000 1.46 +++ configure.ac 3 Sep 2006 17:05:02 -0000 @@ -98,7 +98,7 @@ dnl ==================================== PKG_CHECK_MODULES(GEDIT, [ glib-2.0 >= 2.12.0 gtk+-2.0 >= 2.10.0 - gtksourceview-1.0 >= 1.7.2 + 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.121 diff -u -p -u -p -r1.121 Makefile.am --- gedit/Makefile.am 7 Aug 2006 16:42:40 -0000 1.121 +++ gedit/Makefile.am 3 Sep 2006 17:05:04 -0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = dialogs -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 "^[[^_]].*" Index: gedit/gedit-document.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-document.c,v retrieving revision 1.135 diff -u -p -u -p -r1.135 gedit-document.c --- gedit/gedit-document.c 24 Aug 2006 13:17:13 -0000 1.135 +++ gedit/gedit-document.c 3 Sep 2006 17:05:05 -0000 @@ -509,8 +509,8 @@ set_language (GeditDocument *doc, return; gtk_source_buffer_set_language (GTK_SOURCE_BUFFER (doc), lang); - if (lang != NULL) - gedit_language_init_tag_styles (lang); +// if (lang != NULL) +// gedit_language_init_tag_styles (lang); if (lang != NULL) gtk_source_buffer_set_highlight (GTK_SOURCE_BUFFER (doc), Index: gedit/gedit-languages-manager.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-languages-manager.c,v retrieving revision 1.13 diff -u -p -u -p -r1.13 gedit-languages-manager.c --- gedit/gedit-languages-manager.c 23 Aug 2006 15:21:27 -0000 1.13 +++ gedit/gedit-languages-manager.c 3 Sep 2006 17:05:05 -0000 @@ -93,220 +93,6 @@ gedit_languages_manager_get_language_fro return NULL; } -static gchar* -get_gconf_key (GtkSourceLanguage *language, const gchar *tag_id) -{ - gchar *key; - gchar *lang_id; - - lang_id = gtk_source_language_get_id (language); - - key = g_strconcat (GPM_SYNTAX_HL_DIR, "/", lang_id, "/", tag_id, NULL); - - g_return_val_if_fail (gconf_valid_key (key, NULL), NULL); - - g_free (lang_id); - - return key; -} - -static gchar * -gdk_color_to_string (GdkColor color) -{ - return g_strdup_printf ("#%04x%04x%04x", - color.red, - color.green, - color.blue); -} - -static gchar * -tag_style_to_string (const GtkSourceTagStyle *style) -{ - gchar *res; - gchar *background; - gchar *foreground; - - background = gdk_color_to_string (style->background); - foreground = gdk_color_to_string (style->foreground); - - res = g_strdup_printf ("%d/%s/%s/%d/%d/%d/%d", - style->mask, - foreground, - background, - style->italic, - style->bold, - style->underline, - style->strikethrough); - - g_free (foreground); - g_free (background); - - return res; -} - -static GtkSourceTagStyle * -string_to_tag_style (const gchar *string) -{ - const int items_len[] = {1, 13, 13, 1, 1, 1, 1}; - guint i; - gchar** items; - GtkSourceTagStyle *style; - - style = gtk_source_tag_style_new (); - items = g_strsplit (string, "/", G_N_ELEMENTS(items_len)); - - for (i = 0; i < G_N_ELEMENTS (items_len); ++i) - { - if ((items[i] == NULL) || (strlen (items[i]) != items_len[i])) - goto error; - } - - style->is_default = FALSE; - - style->mask = items[0][0] - '0'; - if (style->mask < 0 || style->mask > 3) - goto error; - - if (!gdk_color_parse (items[1], &style->foreground)) - goto error; - - if (!gdk_color_parse (items[2], &style->background)) - goto error; - - style->italic = items[3][0] - '0'; - if (!IS_VALID_BOOLEAN (style->italic)) - goto error; - - style->bold = items[4][0] - '0'; - if (!IS_VALID_BOOLEAN (style->bold)) - goto error; - - style->underline = items[5][0] - '0'; - if (!IS_VALID_BOOLEAN (style->underline)) - goto error; - - style->strikethrough = items[6][0] - '0'; - if (!IS_VALID_BOOLEAN (style->strikethrough)) - goto error; - - g_strfreev (items); - return style; - -error: - gtk_source_tag_style_free (style); - - g_strfreev (items); - - return NULL; -} - -void -gedit_language_set_tag_style (GtkSourceLanguage *language, - const gchar *tag_id, - const GtkSourceTagStyle *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; - -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 language_compare (gconstpointer a, gconstpointer b) { Index: gedit/gedit-languages-manager.h =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit-languages-manager.h,v retrieving revision 1.7 diff -u -p -u -p -r1.7 gedit-languages-manager.h --- gedit/gedit-languages-manager.h 23 Aug 2006 13:42:01 -0000 1.7 +++ gedit/gedit-languages-manager.h 3 Sep 2006 17:05:05 -0000 @@ -42,12 +42,6 @@ GtkSourceLanguage *gedit_languages_man (GtkSourceLanguagesManager *lm, const gchar *lang_id); -void gedit_language_set_tag_style (GtkSourceLanguage *language, - const gchar *tag_id, - const GtkSourceTagStyle *style); - -void gedit_language_init_tag_styles (GtkSourceLanguage *language); - const GSList *gedit_languages_manager_get_available_languages_sorted (GtkSourceLanguagesManager *lm); Index: gedit/gedit.c =================================================================== RCS file: /cvs/gnome/gedit/gedit/gedit.c,v retrieving revision 1.142 diff -u -p -u -p -r1.142 gedit.c --- gedit/gedit.c 23 Aug 2006 10:59:36 -0000 1.142 +++ gedit/gedit.c 3 Sep 2006 17:05:07 -0000 @@ -462,7 +462,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 ("gedit2"); 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.75 diff -u -p -u -p -r1.75 gedit-preferences-dialog.c --- gedit/dialogs/gedit-preferences-dialog.c 17 Aug 2006 21:01:17 -0000 1.75 +++ gedit/dialogs/gedit-preferences-dialog.c 3 Sep 2006 17:05:08 -0000 @@ -750,360 +750,6 @@ setup_font_colors_page (GeditPreferences } static void -enable_syntax_hl_button_toggled (GtkWidget *button, - GeditPreferencesDialog *dlg) -{ - g_return_if_fail (button == dlg->priv->enable_syntax_hl_checkbutton); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) - { - gedit_prefs_manager_set_enable_syntax_highlighting (TRUE); - gtk_widget_set_sensitive (dlg->priv->hl_vbox, TRUE); - } - else - { - gedit_prefs_manager_set_enable_syntax_highlighting (FALSE); - gtk_widget_set_sensitive (dlg->priv->hl_vbox, FALSE); - } -} - -static void -language_changed_cb (GtkComboBox *combobox, - GeditPreferencesDialog *dlg) -{ - const GSList *languages; - gint active; - GSList *tags, *l; - GtkSourceLanguage *lang; - GtkTreeIter iter; - GtkTreePath *path; - - languages = gedit_languages_manager_get_available_languages_sorted ( - gedit_get_languages_manager ()); - - active = gtk_combo_box_get_active (combobox); - if (active < 0) - { - /* no active language: no lang files found */ - return; - } - - lang = g_slist_nth_data ((GSList*)languages, active); - - gtk_list_store_clear (dlg->priv->tags_treeview_model); - - tags = gtk_source_language_get_tags (lang); - l = tags; - - while (l != NULL) - { - gchar *name; - gchar *id; - GtkSourceTag *tag; - - tag = GTK_SOURCE_TAG (l->data); - - g_object_get (tag, "name", &name, "id", &id, NULL); - gtk_list_store_append (dlg->priv->tags_treeview_model, &iter); - gtk_list_store_set (dlg->priv->tags_treeview_model, - &iter, - NAME_COLUMN, name, - ID_COLUMN, id, - -1); - g_free (name); - g_free (id); - - l = g_slist_next (l); - } - - g_slist_foreach (tags, (GFunc)g_object_unref, NULL); - g_slist_free (tags); - - /* Trigger styles_cb on first item so color & font widgets get set. */ - 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); -} - -static GtkSourceLanguage * -get_selected_language (GeditPreferencesDialog *dlg) -{ - const GSList *languages; - GtkSourceLanguage *lang; - - languages = gedit_languages_manager_get_available_languages_sorted ( - gedit_get_languages_manager ()); - lang = g_slist_nth_data ((GSList*)languages, - gtk_combo_box_get_active (GTK_COMBO_BOX (dlg->priv->hl_mode_combobox))); - - return lang; -} - -static GtkSourceTagStyle * -get_selected_style (GeditPreferencesDialog *dlg) -{ - GtkTreePath *path; - GtkTreeIter iter; - gchar *id; - GtkSourceLanguage *lang; - GtkSourceTagStyle *style; - GtkSourceTagStyle *def_style; - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (dlg->priv->tags_treeview), &path, NULL); - gtk_tree_model_get_iter (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, path); - gtk_tree_path_free (path); - gtk_tree_model_get (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, ID_COLUMN, &id, -1); - - lang = get_selected_language (dlg); - - style = gtk_source_language_get_tag_style (lang, id); - def_style = gtk_source_language_get_tag_default_style (lang, id); - - if (style == NULL) - return def_style; - - style->is_default = TRUE; - def_style->is_default = TRUE; - - style->is_default = (memcmp (style, def_style, sizeof (GtkSourceTagStyle)) == 0); - gtk_source_tag_style_free (def_style); - - g_free (id); - - return style; -} - -static void -style_button_toggled (GtkToggleButton *button, - GeditPreferencesDialog *dlg) -{ - GtkTreePath *path; - GtkTreeIter iter; - gchar *id; - GtkSourceLanguage *lang; - GtkSourceTagStyle *style; - GtkSourceTagStyle *new_style; - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (dlg->priv->tags_treeview), &path, NULL); - gtk_tree_model_get_iter (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, path); - gtk_tree_path_free (path); - gtk_tree_model_get (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, ID_COLUMN, &id, -1); - - lang = get_selected_language (dlg); - - style = gtk_source_language_get_tag_style (lang, id); - if (style == NULL) - { - style = gtk_source_tag_style_new (); - } - - new_style = gtk_source_tag_style_copy (style); - - new_style->bold = gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->bold_togglebutton)); - new_style->italic = gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->italic_togglebutton)); - new_style->underline = gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->underline_togglebutton)); - new_style->strikethrough = gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->strikethrough_togglebutton)); - - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->foreground_checkbutton))) - { - new_style->mask |= GTK_SOURCE_TAG_STYLE_USE_FOREGROUND; - gtk_color_button_get_color (GTK_COLOR_BUTTON (dlg->priv->foreground_colorbutton), - &new_style->foreground); - gtk_widget_set_sensitive (dlg->priv->foreground_colorbutton, - TRUE); - } - else - { - new_style->mask &= ~GTK_SOURCE_TAG_STYLE_USE_FOREGROUND; - gtk_widget_set_sensitive (dlg->priv->foreground_colorbutton, - FALSE); - } - - if (gtk_toggle_button_get_active ( - GTK_TOGGLE_BUTTON (dlg->priv->background_checkbutton))) - { - new_style->mask |= GTK_SOURCE_TAG_STYLE_USE_BACKGROUND; - gtk_color_button_get_color (GTK_COLOR_BUTTON (dlg->priv->background_colorbutton_2), - &new_style->background); - gtk_widget_set_sensitive (dlg->priv->background_colorbutton_2, - TRUE); - } - else - { - new_style->mask &= ~GTK_SOURCE_TAG_STYLE_USE_BACKGROUND; - gtk_widget_set_sensitive (dlg->priv->background_colorbutton_2, - FALSE); - } - - if (memcmp (style, new_style, sizeof (GtkSourceTagStyle)) != 0) - { - GtkSourceTagStyle *def_style; - - def_style = gtk_source_language_get_tag_default_style (lang, id); - - if (!(new_style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND)) - { - new_style->background = def_style->background; - } - - if (!(new_style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND)) - { - new_style->foreground = def_style->foreground; - } - - gtk_widget_set_sensitive (dlg->priv->reset_button, - memcmp (new_style, def_style, sizeof (GtkSourceTagStyle)) != 0); - - gedit_language_set_tag_style (lang, id, new_style); - - gtk_source_tag_style_free (def_style); - } - - gtk_source_tag_style_free (style); - gtk_source_tag_style_free (new_style); - - g_free (id); -} - -static void -style_color_set (GtkColorButton *button, - GeditPreferencesDialog *dlg) -{ - style_button_toggled (NULL, dlg); -} - -static void -styles_cb (GtkWidget *treeview, - GeditPreferencesDialog *dlg) -{ - GtkSourceTagStyle *style; - - style = get_selected_style (dlg); - g_return_if_fail (style != NULL); - - /* we must block callbacks while setting the new values */ - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->bold_togglebutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->italic_togglebutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->underline_togglebutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->strikethrough_togglebutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->foreground_checkbutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->background_checkbutton), - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->foreground_colorbutton), - G_CALLBACK (style_color_set), dlg); - g_signal_handlers_block_by_func (G_OBJECT (dlg->priv->background_colorbutton_2), - G_CALLBACK (style_color_set), dlg); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->bold_togglebutton), - style->bold); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->italic_togglebutton), - style->italic); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->underline_togglebutton), - style->underline); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->strikethrough_togglebutton), - style->strikethrough); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->foreground_checkbutton), - style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); - - if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) == GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) - { - gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->priv->foreground_colorbutton), - &style->foreground); - } - else - { - GdkColor text_color; - - text_color = gedit_prefs_manager_get_text_color (); - gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->priv->foreground_colorbutton), - &text_color); - } - - gtk_widget_set_sensitive (dlg->priv->foreground_colorbutton, - style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->background_checkbutton), - style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); - - if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) == GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) - { - gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->priv->background_colorbutton_2), - &style->background); - } - else - { - GdkColor background_color; - - background_color = gedit_prefs_manager_get_background_color (); - gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->priv->background_colorbutton_2), - &background_color); - } - - gtk_widget_set_sensitive (dlg->priv->background_colorbutton_2, - style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); - - gtk_widget_set_sensitive (dlg->priv->reset_button, !style->is_default); - - /* reenable callbacks */ - g_signal_handlers_unblock_by_func (dlg->priv->bold_togglebutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->italic_togglebutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->underline_togglebutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->strikethrough_togglebutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->foreground_checkbutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->background_checkbutton, - G_CALLBACK (style_button_toggled), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->foreground_colorbutton, - G_CALLBACK (style_color_set), dlg); - g_signal_handlers_unblock_by_func (dlg->priv->background_colorbutton_2, - G_CALLBACK (style_color_set), dlg); - - gtk_source_tag_style_free (style); -} - -static void -reset_button_clicked (GtkButton *button, - GeditPreferencesDialog *dlg) -{ - GtkTreePath *path; - GtkTreeIter iter; - gchar *id; - GtkSourceLanguage *lang; - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (dlg->priv->tags_treeview), &path, NULL); - gtk_tree_model_get_iter (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, path); - gtk_tree_path_free (path); - gtk_tree_model_get (GTK_TREE_MODEL (dlg->priv->tags_treeview_model), - &iter, ID_COLUMN, &id, -1); - - lang = get_selected_language (dlg); - - gedit_language_set_tag_style (lang, id, NULL); - - styles_cb (NULL, dlg); -} - -static void select_default_language (GeditPreferencesDialog *dlg) { const GSList *languages, *l; @@ -1141,107 +787,6 @@ select_default_language (GeditPreference } static void -setup_syntax_highlighting_page (GeditPreferencesDialog *dlg) -{ - gboolean hl_enabled; - const GSList *languages, *l; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - /* Set initial state */ - hl_enabled = gedit_prefs_manager_get_enable_syntax_highlighting (); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->priv->enable_syntax_hl_checkbutton), - hl_enabled); - gtk_widget_set_sensitive (dlg->priv->hl_vbox, hl_enabled); - - /* Create GtkListStore for styles & setup treeview. */ - dlg->priv->tags_treeview_model = gtk_list_store_new (NUM_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING); - - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dlg->priv->tags_treeview_model), - 0, - GTK_SORT_ASCENDING); - gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->tags_treeview), - GTK_TREE_MODEL (dlg->priv->tags_treeview_model)); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Elements"), renderer, - "text", NAME_COLUMN, NULL); - - gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->tags_treeview), column); - - /* Connect signals */ - g_signal_connect (dlg->priv->hl_mode_combobox, - "changed", - G_CALLBACK (language_changed_cb), - dlg); - 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 ()); - - l = languages; - - while (l != NULL) - { - GtkSourceLanguage *lang = GTK_SOURCE_LANGUAGE (l->data); - gchar *name = gtk_source_language_get_name (lang); - - gtk_combo_box_append_text (GTK_COMBO_BOX (dlg->priv->hl_mode_combobox), name); - g_free (name); - - l = g_slist_next (l); - } - - gtk_combo_box_set_active (GTK_COMBO_BOX (dlg->priv->hl_mode_combobox), 0); - - g_signal_connect (dlg->priv->enable_syntax_hl_checkbutton, - "toggled", - G_CALLBACK (enable_syntax_hl_button_toggled), - dlg); - g_signal_connect (dlg->priv->bold_togglebutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->italic_togglebutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->underline_togglebutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->strikethrough_togglebutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->foreground_checkbutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->background_checkbutton, - "toggled", - G_CALLBACK (style_button_toggled), - dlg); - g_signal_connect (dlg->priv->foreground_colorbutton, - "color_set", - G_CALLBACK (style_color_set), - dlg); - g_signal_connect (dlg->priv->background_colorbutton_2, - "color_set", - G_CALLBACK (style_color_set), - dlg); - g_signal_connect (dlg->priv->reset_button, - "clicked", - G_CALLBACK (reset_button_clicked), - dlg); -} - -static void setup_plugins_page (GeditPreferencesDialog *dlg) { GtkWidget *page_content; @@ -1362,7 +907,6 @@ gedit_preferences_dialog_init (GeditPref setup_editor_page (dlg); setup_view_page (dlg); setup_font_colors_page (dlg); - setup_syntax_highlighting_page (dlg); setup_plugins_page (dlg); } 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 3 Sep 2006 17:05:08 -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. */