diff pidgin/gtkutils.c @ 16993:87e6707b512f

merge of '4c166ec2780777ec3a8a3f5ad6774ec0a47c35e2' and 'a7fe56508258038ba8b2ff7bb614d603136301ba'

--- a/pidgin/gtkutils.c	Wed May 09 21:50:29 2007 +0000
+++ b/pidgin/gtkutils.c	Wed May 09 22:04:39 2007 +0000
@@ -103,17 +103,17 @@
 	if (purple_running_gnome()) {
 		char *path, *font;
 		PangoFontDescription *desc = NULL;
-				
+
 		if ((path = g_find_program_in_path("gconftool-2"))) {
 			g_free(path);
 			if (!g_spawn_command_line_sync(
-					"gconftool-2 -g /desktop/gnome/interface/document_font_name", 
+					"gconftool-2 -g /desktop/gnome/interface/document_font_name",
 					&font, NULL, NULL, NULL))
 				return;
 		}
 		desc = pango_font_description_from_string(font);
 		g_free(font);
-		
+
 		if (desc) {
 			gtk_widget_modify_font(imhtml, desc);
 			pango_font_description_free(desc);
@@ -2325,6 +2325,10 @@
 
 	if (!filename || g_stat(filename, &st))
 	{
+#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
+		gtk_file_chooser_set_preview_widget_active(
+					GTK_FILE_CHOOSER(dialog->icon_filesel), FALSE);
+#endif /* FILECHOOSER */
 		g_free(filename);
 		return;
 	}