Mercurial > pidgin
changeset 16981:9c4c7f28b005
merge of '4e4616e3116cf5f5f33872dc1ef102da16c51d53'
and '890c0d29c121ab937f241de18d1b2d6cbf8bf022'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 09 May 2007 22:04:36 +0000 |
parents | 1d7e0acc8a3e (diff) d637851abeb8 (current diff) |
children | 87e6707b512f |
files | |
diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Wed May 09 21:15:05 2007 +0000 +++ b/pidgin/gtkutils.c Wed May 09 22:04:36 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); @@ -2279,6 +2279,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; }