summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadrul Habib Chowdhury <sadrul@pidgin.im>2007-10-10 01:01:21 +0000
committerSadrul Habib Chowdhury <sadrul@pidgin.im>2007-10-10 01:01:21 +0000
commit71a86f972c6863177e6457b71cbf45ffbeaeb98c (patch)
tree2c1bfbaa9c3afaa6a84dc9bb5c566b5ec8f3d756
parent986269861794fbca10c7bddc4e4837566907cc1e (diff)
downloadpidgin-71a86f972c6863177e6457b71cbf45ffbeaeb98c.tar.gz
Fix CID 353
-rw-r--r--pidgin/gtkutils.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index b20a717aa2..666b122f4a 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -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);