# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1191981576 0
# Node ID c026361d4e63deb82d833cf4ca4a3a9ed9a696c2
# Parent  a7733677ee209f8c4b1fa44c7ae9ad49f4ece6aa# Parent  2a6ef74f5a4e7cb97477a3606bed49fd97bdac12
merge of 'cd26f6af7f8ee75ef909ae08b06ad5a1978051d9'
     and 'e995c23bc19d0f8a2f833a105da86eaa9218f517'

diff -r a7733677ee20 -r c026361d4e63 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Wed Oct 10 01:45:37 2007 +0000
+++ b/finch/libgnt/gntwm.c	Wed Oct 10 01:59:36 2007 +0000
@@ -1717,12 +1717,11 @@
 void gnt_wm_window_close(GntWM *wm, GntWidget *widget)
 {
 	GntWS *s;
-	GntNode *node;
 	int pos;
 
 	s = gnt_wm_widget_find_workspace(wm, widget);
 
-	if ((node = g_hash_table_lookup(wm->nodes, widget)) == NULL)
+	if (g_hash_table_lookup(wm->nodes, widget) == NULL)
 		return;
 
 	g_signal_emit(wm, signals[SIG_CLOSE_WIN], 0, widget);
diff -r a7733677ee20 -r c026361d4e63 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Wed Oct 10 01:45:37 2007 +0000
+++ b/pidgin/gtkutils.c	Wed Oct 10 01:59:36 2007 +0000
@@ -111,19 +111,20 @@
 		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);