Mercurial > pidgin.yaz
changeset 8836:413aad27f728
[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>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 28 Apr 2004 01:45:06 +0000 |
| parents | 7f38bf98e4e9 |
| children | 25206a0fb4e4 |
| files | configure.ac pixmaps/smileys/Makefile.am pixmaps/smileys/none/Makefile.am src/gtkprefs.c |
| diffstat | 4 files changed, 19 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- /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)
--- 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; }