aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-06-16 20:34:57 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-06-16 20:34:57 +0800
commitceede594a2609e0d5148e38284ad23b87d78467d (patch)
tree8ce5c2b7f25d167089d7777f9ee60377c755b25d /mail
parentb5ecad6eb986fcd31fc3e15ee774916f95ff4e76 (diff)
downloadgsoc2013-evolution-ceede594a2609e0d5148e38284ad23b87d78467d.tar.gz
gsoc2013-evolution-ceede594a2609e0d5148e38284ad23b87d78467d.tar.zst
gsoc2013-evolution-ceede594a2609e0d5148e38284ad23b87d78467d.zip
clear the error, don't free it, so NULL is handled properly
2004-06-16 JP Rosevear <jpr@novell.com> * em-composer-prefs.c (spell_set_ui): clear the error, don't free it, so NULL is handled properly svn path=/trunk/; revision=26365
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-composer-prefs.c2
2 files changed, 6 insertions, 1 deletions
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 <jpr@novell.com>
+
+ * em-composer-prefs.c (spell_set_ui): clear the error, don't free
+ it, so NULL is handled properly
+
2004-06-16 Not Zed <NotZed@Ximian.com>
** 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 ());
}