gnome-settings-daemon r353 - in trunk: . plugins/font

[jensg svn gnome org]

Author: jensg
Date: Fri May 30 16:43:10 2008
New Revision: 353
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=353&view=rev

Log:
2008-05-30  Jens Granseuer  <jensgr gmx net>

	* plugins/font/gsd-font-manager.c: (load_xcursor_theme): fix a few
	leaks


Modified:
   trunk/ChangeLog
   trunk/plugins/font/gsd-font-manager.c

Modified: trunk/plugins/font/gsd-font-manager.c
==============================================================================
--- trunk/plugins/font/gsd-font-manager.c	(original)
+++ trunk/plugins/font/gsd-font-manager.c	Fri May 30 16:43:10 2008
@@ -156,18 +156,22 @@
 
         command = "xrdb -nocpp -merge";
 
-        add_string = g_string_new (NULL);
 
-        cursor_theme = gconf_client_get_string (client,
-                                                "/desktop/gnome/peripherals/mouse/cursor_theme",
-                                                NULL);
         size = gconf_client_get_int (client,
                                      "/desktop/gnome/peripherals/mouse/cursor_size",
                                      NULL);
-        if (cursor_theme == NULL || size <= 0) {
+        if (size <= 0) {
                 return;
         }
 
+        cursor_theme = gconf_client_get_string (client,
+                                                "/desktop/gnome/peripherals/mouse/cursor_theme",
+                                                NULL);
+        if (cursor_theme == NULL) {
+                return;
+        }
+
+        add_string = g_string_new (NULL);
         g_string_append_printf (add_string,
                                 "Xcursor.theme: %s\n",
                                 cursor_theme);