rpms / evolution

Clone
Source Code
GIT

Blame evolution-2.9.2-gtk-font-button.patch

c4 c5 c5-plus c6 c6-plus c7 c7-alt c8-beta evolution-2_27_5-3_fc12_rhel6_rebuild f10 f11 f12 f13 f14 f15 f16 f17 f18 f19 f20 f20-gnome-3-12 f21 f22 f23 f24 f25 f26 f27 f28 f29 f7 f8 f9 master private-check-only-active-folders-branch private-evo-sanity-2_10_0-branch private-evo-sanity-2_8_0-6-branch private-mbarnes-kb
  1.   293861cfede81013d319eaf183ce7a942b3fc1cc
  2.   evolution-2.9.2-gtk-font-button.patch
Blob History Raw
Matthew Barnes 39e25a 
--- evolution-2.9.2/mail/em-mailer-prefs.c.gtk-font-button	2006-08-09 04:43:27.000000000 -0400
Matthew Barnes 39e25a 
+++ evolution-2.9.2/mail/em-mailer-prefs.c	2006-11-11 08:31:53.000000000 -0500
Matthew Barnes 39e25a 
@@ -36,8 +36,8 @@
Matthew Barnes 39e25a 
 #include <bonobo/bonobo-generic-factory.h>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 #include <libgnomeui/gnome-color-picker.h>
Matthew Barnes 39e25a 
-#include <libgnomeui/gnome-font-picker.h>
Matthew Barnes 39e25a 
 #include <gtk/gtkfilechooserbutton.h>
Matthew Barnes 39e25a 
+#include <gtk/gtkfontbutton.h>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 #include <glade/glade.h>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
@@ -535,12 +535,14 @@
Matthew Barnes 39e25a 
 }
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 static void
Matthew Barnes 39e25a 
-font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs)
Matthew Barnes 39e25a 
+font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs)
Matthew Barnes 39e25a 
 {
Matthew Barnes 39e25a 
-	const char *key;
Matthew Barnes 39e25a 
+	const gchar *key;
Matthew Barnes 39e25a 
+	const gchar *font_name;
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
-	key = g_object_get_data ((GObject *) fontpicker, "key");
Matthew Barnes 39e25a 
-	gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL);
Matthew Barnes 39e25a 
+	key = g_object_get_data (G_OBJECT (font_button), "key");
Matthew Barnes 39e25a 
+	font_name = gtk_font_button_get_font_name (font_button);
Matthew Barnes 39e25a 
+	gconf_client_set_string (prefs->gconf, key, font_name, NULL);
Matthew Barnes 39e25a 
 }
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 static void
Matthew Barnes 39e25a 
@@ -841,8 +843,8 @@
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 	/* Mail  Fonts */
Matthew Barnes 39e25a 
 	font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL);
Matthew Barnes 39e25a 
-	prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed"));
Matthew Barnes 39e25a 
-	gnome_font_picker_set_font_name (prefs->font_fixed, font);
Matthew Barnes 39e25a 
+	prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed"));
Matthew Barnes 39e25a 
+	gtk_font_button_set_font_name (prefs->font_fixed, font);
Matthew Barnes 39e25a 
 	g_free (font);
Matthew Barnes 39e25a 
 	g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace");
Matthew Barnes 39e25a 
 	g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs);
Matthew Barnes 39e25a 
@@ -850,8 +852,8 @@
Matthew Barnes 39e25a 
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE);
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 	font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL);
Matthew Barnes 39e25a 
-	prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable"));
Matthew Barnes 39e25a 
-	gnome_font_picker_set_font_name (prefs->font_variable, font);
Matthew Barnes 39e25a 
+	prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable"));
Matthew Barnes 39e25a 
+	gtk_font_button_set_font_name (prefs->font_variable, font);
Matthew Barnes 39e25a 
 	g_free (font);
Matthew Barnes 39e25a 
 	g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable");
Matthew Barnes 39e25a 
 	g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs);
Matthew Barnes 39e25a 
--- evolution-2.9.2/mail/em-mailer-prefs.h.gtk-font-button	2006-05-25 00:59:47.000000000 -0400
Matthew Barnes 39e25a 
+++ evolution-2.9.2/mail/em-mailer-prefs.h	2006-11-11 08:31:53.000000000 -0500
Matthew Barnes 39e25a 
@@ -39,7 +39,7 @@
Matthew Barnes 39e25a 
 struct _GladeXML;
Matthew Barnes 39e25a 
 struct _GnomeColorPicker;
Matthew Barnes 39e25a 
 struct _GtkFileChooserbutton;
Matthew Barnes 39e25a 
-struct _GnomeFontPicker;
Matthew Barnes 39e25a 
+struct _GtkFontButton;
Matthew Barnes 39e25a 
 struct _GConfClient;
Matthew Barnes 39e25a 
 struct _GtkButton;
Matthew Barnes 39e25a 
 struct _GtkTreeView;
Matthew Barnes 39e25a 
@@ -92,8 +92,8 @@
Matthew Barnes 39e25a 
 	struct _GtkFileChooserButton *notify_sound_file;
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 	/* HTML Mail tab */
Matthew Barnes 39e25a 
-	struct _GnomeFontPicker *font_variable;
Matthew Barnes 39e25a 
-	struct _GnomeFontPicker *font_fixed;
Matthew Barnes 39e25a 
+	struct _GtkFontButton *font_variable;
Matthew Barnes 39e25a 
+	struct _GtkFontButton *font_fixed;
Matthew Barnes 39e25a 
 	struct _GtkToggleButton *font_share;
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 	/* Loading Images */
Matthew Barnes 39e25a 
--- evolution-2.9.2/mail/mail-config.glade.gtk-font-button	2006-07-19 11:26:27.000000000 -0400
Matthew Barnes 39e25a 
+++ evolution-2.9.2/mail/mail-config.glade	2006-11-11 08:31:53.000000000 -0500
Matthew Barnes 39e25a 
@@ -4700,14 +4700,14 @@
Matthew Barnes 39e25a 
 			      </child>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 			      <child>
Matthew Barnes 39e25a 
-				<widget class="GnomeFontPicker" id="FontFixed">
Matthew Barnes 39e25a 
+				<widget class="GtkFontButton" id="FontFixed">
Matthew Barnes 39e25a 
 				  <property name="visible">True</property>
Matthew Barnes 39e25a 
 				  <property name="can_focus">True</property>
Matthew Barnes 39e25a 
 				  <property name="title" translatable="yes">Select HTML fixed width font</property>
Matthew Barnes 39e25a 
-				  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
Matthew Barnes 39e25a 
+				  <property name="show_style">True</property>
Matthew Barnes 39e25a 
 				  <property name="show_size">True</property>
Matthew Barnes 39e25a 
-				  <property name="use_font_in_label">False</property>
Matthew Barnes 39e25a 
-				  <property name="label_font_size">14</property>
Matthew Barnes 39e25a 
+				  <property name="use_font">False</property>
Matthew Barnes 39e25a 
+				  <property name="use_size">False</property>
Matthew Barnes 39e25a 
 				  <property name="focus_on_click">True</property>
Matthew Barnes 39e25a 
 				  <signal name="font_set" handler="changed"/>
Matthew Barnes 39e25a 
 				</widget>
Matthew Barnes 39e25a 
@@ -4722,14 +4722,14 @@
Matthew Barnes 39e25a 
 			      </child>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 			      <child>
Matthew Barnes 39e25a 
-				<widget class="GnomeFontPicker" id="FontVariable">
Matthew Barnes 39e25a 
+				<widget class="GtkFontButton" id="FontVariable">
Matthew Barnes 39e25a 
 				  <property name="visible">True</property>
Matthew Barnes 39e25a 
 				  <property name="can_focus">True</property>
Matthew Barnes 39e25a 
 				  <property name="title" translatable="yes">Select HTML variable width font</property>
Matthew Barnes 39e25a 
-				  <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
Matthew Barnes 39e25a 
+				  <property name="show_style">True</property>
Matthew Barnes 39e25a 
 				  <property name="show_size">True</property>
Matthew Barnes 39e25a 
-				  <property name="use_font_in_label">False</property>
Matthew Barnes 39e25a 
-				  <property name="label_font_size">14</property>
Matthew Barnes 39e25a 
+				  <property name="use_font">False</property>
Matthew Barnes 39e25a 
+				  <property name="use_size">False</property>
Matthew Barnes 39e25a 
 				  <property name="focus_on_click">True</property>
Matthew Barnes 39e25a 
 				  <signal name="font_set" handler="changed"/>
Matthew Barnes 39e25a 
 				</widget>
Matthew Barnes 39e25a 
@@ -8484,14 +8484,14 @@
Matthew Barnes 39e25a 
 		  </child>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 		  <child>
Matthew Barnes 39e25a 
-		    <widget class="GnomeFontPicker" id="print_fixed">
Matthew Barnes 39e25a 
+		    <widget class="GtkFontButton" id="print_fixed">
Matthew Barnes 39e25a 
 		      <property name="visible">True</property>
Matthew Barnes 39e25a 
 		      <property name="can_focus">True</property>
Matthew Barnes 39e25a 
 		      <property name="title" translatable="yes">Select HTML fixed width font for printing</property>
Matthew Barnes 39e25a 
-		      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
Matthew Barnes 39e25a 
+		      <property name="show_style">True</property>
Matthew Barnes 39e25a 
 		      <property name="show_size">True</property>
Matthew Barnes 39e25a 
-		      <property name="use_font_in_label">False</property>
Matthew Barnes 39e25a 
-		      <property name="label_font_size">14</property>
Matthew Barnes 39e25a 
+		      <property name="use_font">False</property>
Matthew Barnes 39e25a 
+		      <property name="use_size">False</property>
Matthew Barnes 39e25a 
 		      <property name="focus_on_click">True</property>
Matthew Barnes 39e25a 
 		      <signal name="font_set" handler="changed"/>
Matthew Barnes 39e25a 
 		    </widget>
Matthew Barnes 39e25a 
@@ -8506,14 +8506,14 @@
Matthew Barnes 39e25a 
 		  </child>
Matthew Barnes 39e25a
Matthew Barnes 39e25a 
 		  <child>
Matthew Barnes 39e25a 
-		    <widget class="GnomeFontPicker" id="print_variable">
Matthew Barnes 39e25a 
+		    <widget class="GtkFontButton" id="print_variable">
Matthew Barnes 39e25a 
 		      <property name="visible">True</property>
Matthew Barnes 39e25a 
 		      <property name="can_focus">True</property>
Matthew Barnes 39e25a 
 		      <property name="title" translatable="yes">Select HTML variable width font for printing</property>
Matthew Barnes 39e25a 
-		      <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
Matthew Barnes 39e25a 
+		      <property name="show_style">True</property>
Matthew Barnes 39e25a 
 		      <property name="show_size">True</property>
Matthew Barnes 39e25a 
-		      <property name="use_font_in_label">False</property>
Matthew Barnes 39e25a 
-		      <property name="label_font_size">14</property>
Matthew Barnes 39e25a 
+		      <property name="use_font">False</property>
Matthew Barnes 39e25a 
+		      <property name="use_size">False</property>
Matthew Barnes 39e25a 
 		      <property name="focus_on_click">True</property>
Matthew Barnes 39e25a 
 		      <signal name="font_set" handler="changed"/>
Matthew Barnes 39e25a 
 		    </widget>

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation