diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-composer-prefs.c | 24 | ||||
| -rw-r--r-- | mail/em-format-html.c | 2 | ||||
| -rw-r--r-- | mail/em-format-quote.c | 2 |
4 files changed, 27 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index adf866479b..300d5edac9 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2008-04-05 Matthew Barnes <mbarnes@redhat.com> + * em-composer-prefs.c: + Fix a corner case that I missed in my last commit. + +2008-04-05 Matthew Barnes <mbarnes@redhat.com> + ** Fixes part of bug #526152, plus some tangential code cleanup. * Makefile.am: diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index 52c7d205da..e74e8f8c34 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -558,12 +558,9 @@ spell_language_toggled_cb (GtkCellRendererToggle *renderer, const gchar *path_string, EMComposerPrefs *prefs) { - GSList *list = NULL; - GConfClient *client; GtkTreeModel *model; GtkTreePath *path; GtkTreeIter iter; - const gchar *key; gboolean active; gboolean valid; @@ -578,6 +575,19 @@ spell_language_toggled_cb (GtkCellRendererToggle *renderer, /* Toggle the active state. */ gtk_tree_model_get (model, &iter, 0, &active, -1); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, !active, -1); +} + +static void +spell_language_save (EMComposerPrefs *prefs) +{ + GSList *list = NULL; + GConfClient *client; + GtkTreeModel *model; + GtkTreeIter iter; + const gchar *key; + gboolean valid; + + model = prefs->language_model; /* Build a list of active languages. */ valid = gtk_tree_model_get_iter_first (model, &iter); @@ -662,6 +672,9 @@ spell_setup (EMComposerPrefs *prefs) available_languages = available_languages->next; } + /* Update the GConf list in case we used a default language. */ + spell_language_save (prefs); + g_slist_free (active_languages); key = "/apps/evolution/mail/composer/spell_color"; @@ -944,13 +957,16 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) "/apps/evolution/mail/composer/charset"); g_free (buf); - /* Spell Checking: GNOME Spell part */ + /* Spell Checking */ widget = glade_xml_get_widget (gui, "colorButtonSpellCheckColor"); prefs->color = GTK_COLOR_BUTTON (widget); widget = glade_xml_get_widget (gui, "listSpellCheckLanguage"); view = GTK_TREE_VIEW (widget); store = gtk_list_store_new ( 3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); + g_signal_connect_swapped ( + store, "row-changed", + G_CALLBACK (spell_language_save), prefs); prefs->language_model = GTK_TREE_MODEL (store); gtk_tree_view_set_model (view, prefs->language_model); renderer = gtk_cell_renderer_toggle_new (); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index a7a18dcdc1..96cf0ca27a 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1673,7 +1673,7 @@ static void efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const char *charset) { EMFormatHTML *efh = (EMFormatHTML *)emf; - char *name, *buf, *value = NULL, *p; + char *name, *buf, *value = NULL; const char *label, *txt; gboolean addrspec = FALSE; char *str_field = NULL; diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c index 3f52b802ba..401801b510 100644 --- a/mail/em-format-quote.c +++ b/mail/em-format-quote.c @@ -295,7 +295,7 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const { CamelMimeMessage *msg = (CamelMimeMessage *) part; EMFormatQuote *emfq = (EMFormatQuote *) emf; - char *name, *buf, *value = NULL, *p; + char *name, *buf, *value = NULL; const char *txt, *label; gboolean addrspec = FALSE; int is_html = FALSE; |