im.pidgin.pidgin: 3efb5d625e5a73423be8be77a6baeed0b65f7e55

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 3efb5d625e5a73423be8be77a6baeed0b65f7e55
Ancestor: e56db1b8a7bb8729e30fb3bf99a94ff7887fe4ec
Author: sadrul at pidgin.im
Date: 2007-10-10T01:01:21
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkutils.c

ChangeLog: 

Fix CID 353

-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	54262f3bbd7b4bd91058bbe6cde4cca6e97156c8
+++ pidgin/gtkutils.c	0352253dbb8ef3e8a0276b60465b7d224b406976
@@ -111,19 +111,20 @@ pidgin_setup_imhtml(GtkWidget *imhtml)
 		desc = pango_font_description_from_string(font);
 	} else if (purple_running_gnome()) {
 		/* Use the GNOME "document" font, if applicable */
-		char *path, *font;
+		char *path;
 
 		if ((path = g_find_program_in_path("gconftool-2"))) {
+			char *font = NULL;
 			g_free(path);
-			if (!g_spawn_command_line_sync(
+			if (g_spawn_command_line_sync(
 					"gconftool-2 -g /desktop/gnome/interface/document_font_name",
-					&font, NULL, NULL, NULL))
-				return;
+					&font, NULL, NULL, NULL)) {
+				desc = pango_font_description_from_string(font);
+			}
+			g_free(font);
 		}
-		desc = pango_font_description_from_string(font);
-		g_free(font);
 	}
-	
+
 	if (desc) {
 		gtk_widget_modify_font(imhtml, desc);
 		pango_font_description_free(desc);