From ceede594a2609e0d5148e38284ad23b87d78467d Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 16 Jun 2004 12:34:57 +0000 Subject: clear the error, don't free it, so NULL is handled properly 2004-06-16 JP Rosevear * em-composer-prefs.c (spell_set_ui): clear the error, don't free it, so NULL is handled properly svn path=/trunk/; revision=26365 --- mail/ChangeLog | 5 +++++ mail/em-composer-prefs.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 445db01311..33fdab7acd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2004-06-16 JP Rosevear + + * em-composer-prefs.c (spell_set_ui): clear the error, don't free + it, so NULL is handled properly + 2004-06-16 Not Zed ** See #56479. diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index cc66aa5d60..053d14cae6 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -536,7 +536,7 @@ spell_set_ui (EMComposerPrefs *prefs) /* setup the language list */ if (!(lang = gconf_client_get_string (prefs->gconf, GNOME_SPELL_GCONF_DIR "/language", &err)) || err) { g_free (lang); - g_error_free (err); + g_clear_error (&err); lang = g_strdup (e_iconv_locale_language ()); } -- cgit v1.2.3