# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1191978376 0
# Node ID 2a6ef74f5a4e7cb97477a3606bed49fd97bdac12
# Parent  e0ce7124d2d48e348494e82c681749e742051ffb# Parent  817425918f92493614e348627bdd15bd396c9024
merge of '3efb5d625e5a73423be8be77a6baeed0b65f7e55'
     and 'c848ad4c20988b5dac9ac164455d3ba2d7307230'

diff -r 817425918f92 -r 2a6ef74f5a4e finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Tue Oct 09 23:46:46 2007 +0000
+++ b/finch/libgnt/gntwm.c	Wed Oct 10 01:06:16 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 817425918f92 -r 2a6ef74f5a4e pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue Oct 09 23:46:46 2007 +0000
+++ b/pidgin/gtkutils.c	Wed Oct 10 01:06:16 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);