changeset 15453:c68f2808f703

merge of '53ec0f43994bc2a1adb7671f7f52c365475ff97a' and 'd29b89ab5d6d87418a4f03545dec207a74bdad0d'
author Sean Egan <seanegan@gmail.com>
date Sun, 28 Jan 2007 21:40:32 +0000
parents c6115dc73b28 (current diff) 154b8d8643a2 (diff)
children 3b45081f6183 79f25bbe69bf
files pidgin/pixmaps/emotes/default/22/scalable/Makefile.mingw pidgin/pixmaps/protocols/22/scalable/msn2.svg pidgin/pixmaps/status/22/scalable/busy22.svg pidgin/pixmaps/status/22/scalable/offline22.svg
diffstat 1 files changed, 21 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkutils.c	Sun Jan 28 21:25:36 2007 +0000
+++ b/pidgin/gtkutils.c	Sun Jan 28 21:40:32 2007 +0000
@@ -98,6 +98,27 @@
 	gaim_gtkthemes_smiley_themeize(imhtml);
 
 	gtk_imhtml_set_funcs(GTK_IMHTML(imhtml), &gtkimhtml_cbs);
+
+	/* Use the GNOME "document" font, if applicable */
+	if (gaim_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", 
+					&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);
+		}
+	}
 }
 
 GtkWidget *