summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-10-27 12:30:18 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-27 12:30:18 +0000
commit7405f040e8f55f19ce3baa185863810802244548 (patch)
treeb5282d2426ee66432d638ec5cb91dc0d39624bf4
parent5ed940e101d81fd1cbcca87df48242a51d449389 (diff)
downloadmetacity-7405f040e8f55f19ce3baa185863810802244548.tar.gz
Add initialisation which I missed on the previous checkin. Also an extra
2008-10-27 Thomas Thurman <tthurman@gnome.org> * src/core/prefs.c (titlebar_handler, handle_preference_update_enum): Add initialisation which I missed on the previous checkin. Also an extra comment. svn path=/trunk/; revision=4004
-rw-r--r--ChangeLog6
-rw-r--r--src/core/prefs.c7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4262a14f..251244e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-27 Thomas Thurman <tthurman@gnome.org>
+
+ * src/core/prefs.c (titlebar_handler, handle_preference_update_enum):
+ Add initialisation which I missed on the previous checkin. Also
+ an extra comment.
+
2008-10-27 Brian Cameron <brian.cameron@sun.com>
Fix some crashes with the new GDM 2.24. Closes #558058.
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 4d37a65c..e3de2fc2 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -650,8 +650,11 @@ handle_preference_update_enum (const gchar *key, GConfValue *value)
* we might consider reverting invalid keys to their original values.
* (We know the old value, so we can look up a suitable string in
* the symtab.)
+ *
+ * (Empty comment follows so the translators don't see this.)
*/
-
+
+ /* */
meta_warning (_("GConf key '%s' is set to an invalid value\n"),
key);
return TRUE;
@@ -1324,7 +1327,7 @@ titlebar_handler (MetaPreference pref,
const gchar *string_value,
gboolean *inform_listeners)
{
- PangoFontDescription *new_desc;
+ PangoFontDescription *new_desc = NULL;
if (string_value)
new_desc = pango_font_description_from_string (string_value);