metacity r4004 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Mon Oct 27 12:30:18 2008
New Revision: 4004
URL: http://svn.gnome.org/viewvc/metacity?rev=4004&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/src/core/prefs.c

Modified: trunk/src/core/prefs.c
==============================================================================
--- trunk/src/core/prefs.c	(original)
+++ trunk/src/core/prefs.c	Mon Oct 27 12:30:18 2008
@@ -650,8 +650,11 @@
        * 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 @@
                   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);