From b12d14e70117e2287cf3b11137c1f2636c09f4d9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Mar 2007 14:13:28 +0000 Subject: Migrate from GnomeFontPicker to GtkFontButton (#373837). 2007-03-27 Matthew Barnes * em-mailer-prefs.c: * em-mailer-prefs.h: * mail-config.glade: Migrate from GnomeFontPicker to GtkFontButton (#373837). svn path=/trunk/; revision=33337 --- mail/ChangeLog | 7 +++++++ mail/em-mailer-prefs.c | 20 +++++++++++--------- mail/em-mailer-prefs.h | 6 +++--- mail/mail-config.glade | 32 ++++++++++++++++---------------- 4 files changed, 37 insertions(+), 28 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 72f22728a9..923c4e1610 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-03-27 Matthew Barnes + + * em-mailer-prefs.c: + * em-mailer-prefs.h: + * mail-config.glade: + Migrate from GnomeFontPicker to GtkFontButton (#373837). + 2007-03-27 Matthew Barnes * em-folder-browser.c: diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 4b944fccb6..7302ff842a 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -36,8 +36,8 @@ #include #include -#include #include +#include #include @@ -545,12 +545,14 @@ custom_font_changed (GtkToggleButton *toggle, EMMailerPrefs *prefs) } static void -font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs) +font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) { - const char *key; + const gchar *key; + const gchar *font_name; - key = g_object_get_data ((GObject *) fontpicker, "key"); - gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL); + key = g_object_get_data (G_OBJECT (font_button), "key"); + font_name = gtk_font_button_get_font_name (font_button); + gconf_client_set_string (prefs->gconf, key, font_name, NULL); } static void @@ -861,8 +863,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) /* Mail Fonts */ font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); - prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed")); - gnome_font_picker_set_font_name (prefs->font_fixed, font); + prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); + gtk_font_button_set_font_name (prefs->font_fixed, font); g_free (font); g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); @@ -870,8 +872,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); - prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); - gnome_font_picker_set_font_name (prefs->font_variable, font); + prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); + gtk_font_button_set_font_name (prefs->font_variable, font); g_free (font); g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index c74f021e68..582938a2d9 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -39,7 +39,7 @@ struct _GtkWidget; struct _GladeXML; struct _GnomeColorPicker; struct _GtkFileChooserbutton; -struct _GnomeFontPicker; +struct _GtkFontButton; struct _GConfClient; struct _GtkButton; struct _GtkTreeView; @@ -94,8 +94,8 @@ struct _EMMailerPrefs { struct _GtkFileChooserButton *notify_sound_file; /* HTML Mail tab */ - struct _GnomeFontPicker *font_variable; - struct _GnomeFontPicker *font_fixed; + struct _GtkFontButton *font_variable; + struct _GtkFontButton *font_fixed; struct _GtkToggleButton *font_share; /* Loading Images */ diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 637c6b2a30..9a14bd8881 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -4700,14 +4700,14 @@ For example: "Work" or "Personal" - + True True Select HTML fixed width font - GNOME_FONT_PICKER_MODE_FONT_INFO + True True - False - 14 + False + False True @@ -4722,14 +4722,14 @@ For example: "Work" or "Personal" - + True True Select HTML variable width font - GNOME_FONT_PICKER_MODE_FONT_INFO + True True - False - 14 + False + False True @@ -8560,14 +8560,14 @@ For example: "Work" or "Personal" - + True True Select HTML fixed width font for printing - GNOME_FONT_PICKER_MODE_FONT_INFO + True True - False - 14 + False + False True @@ -8582,14 +8582,14 @@ For example: "Work" or "Personal" - + True True Select HTML variable width font for printing - GNOME_FONT_PICKER_MODE_FONT_INFO + True True - False - 14 + False + False True -- cgit v1.2.3