# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1083116706 0
# Node ID 413aad27f728ccd330ad2b601c5e6266608dbf4e
# Parent  7f38bf98e4e9cd3e247808f5662b12ab2df50be3
[gaim-migrate @ 9602]
Added the null smiley theme and made the MSN-style font selector read (but
not write) the font prefs.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7f38bf98e4e9 -r 413aad27f728 configure.ac
--- a/configure.ac	Wed Apr 28 01:36:18 2004 +0000
+++ b/configure.ac	Wed Apr 28 01:45:06 2004 +0000
@@ -1080,6 +1080,7 @@
 		   pixmaps/Makefile
 		   pixmaps/smileys/Makefile
 		   pixmaps/smileys/default/Makefile
+		   pixmaps/smileys/none/Makefile
 		   pixmaps/status/Makefile
 		   pixmaps/status/default/Makefile
 		   plugins/Makefile
diff -r 7f38bf98e4e9 -r 413aad27f728 pixmaps/smileys/Makefile.am
--- a/pixmaps/smileys/Makefile.am	Wed Apr 28 01:36:18 2004 +0000
+++ b/pixmaps/smileys/Makefile.am	Wed Apr 28 01:45:06 2004 +0000
@@ -1,2 +1,2 @@
-SUBDIRS = default 
+SUBDIRS = default none 
 
diff -r 7f38bf98e4e9 -r 413aad27f728 pixmaps/smileys/none/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/smileys/none/Makefile.am	Wed Apr 28 01:45:06 2004 +0000
@@ -0,0 +1,4 @@
+gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none
+gaimsmileypix_DATA = theme 
+
+EXTRA_DIST = $(gaimsmileypix_DATA)
diff -r 7f38bf98e4e9 -r 413aad27f728 src/gtkprefs.c
--- a/src/gtkprefs.c	Wed Apr 28 01:36:18 2004 +0000
+++ b/src/gtkprefs.c	Wed Apr 28 01:45:06 2004 +0000
@@ -719,7 +719,7 @@
 	imhtml = gtk_imhtml_new(NULL, NULL);
 	gtk_imhtml_set_editable(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
-	gtk_imhtml_set_whole_buffer_formatting_only(imhtml, TRUE);
+	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 
 	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml),
 			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
@@ -731,6 +731,18 @@
 	gtk_imhtml_append_text(GTK_IMHTML(imhtml), "This is preview text", 0);
 	gtk_container_add(GTK_CONTAINER(sw), imhtml);
 	
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold"))
+		gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic"))
+		gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline"))
+		gtk_imhtml_toggle_underline(GTK_IMHTML(imhtml));
+
+	gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), gaim_prefs_get_int("/gaim/gtk/conversations/font_size"));
+	gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"));
+	gtk_imhtml_toggle_backcolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"));
+	gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/font_face"));
+
 	gtk_widget_show_all(ret);
 	return ret;
 }