--- galeon-2.0.7.orig/src/galeon-prefs-dialog.c	2008-07-04 18:30:50.000000000 +0200
+++ galeon-2.0.7/src/galeon-prefs-dialog.c	2008-10-07 00:42:30.000000000 +0200
@@ -95,6 +95,8 @@
 
 	gboolean    fonts_ignore_updates;
 	char       *fonts_encoding;
+	GtkWidget  *fonts_default_serif;
+	GtkWidget  *fonts_default_sans;
 	GtkWidget  *fonts_serif;
 	GtkWidget  *fonts_sans;
 	GtkWidget  *fonts_cursive;
@@ -784,6 +786,23 @@
 }
 
 static void
+fonts_load_default (GaleonPrefsDialog *self)
+{
+	GaleonPrefsDialogPrivate *p = self->priv;
+	char gconf_key[256];
+	const gchar* value;
+
+	fonts_make_gconf_key (gconf_key, sizeof(gconf_key),
+			      "default", p->fonts_encoding);
+	value = eel_gconf_get_string (gconf_key);
+	if (value && strcmp(value, "sans-serif") == 0) {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p->fonts_default_sans), TRUE);
+	} else {
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p->fonts_default_serif), TRUE);
+	}
+}
+
+static void
 fonts_update_widgets (GaleonPrefsDialog *self)
 {
 	GaleonPrefsDialogPrivate *p = self->priv;
@@ -793,6 +812,8 @@
 
 	p->fonts_ignore_updates = TRUE;
 
+	fonts_load_default (self);
+
 	fonts_load_font (self, "serif",      p->fonts_serif);
 	fonts_load_font (self, "sans-serif", p->fonts_sans);
 	fonts_load_font (self, "cursive",    p->fonts_cursive);
@@ -865,6 +886,43 @@
 }
 
 static void
+on_fonts_radio_changed(GtkRadioButton *button, GaleonPrefsDialog *self)
+{
+	GaleonPrefsDialogPrivate *p = self->priv;
+	gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
+	const char* value;
+	char gconf_key[256];
+
+	if (p->fonts_ignore_updates) return;
+
+	if (active) {
+		const gchar* name = gtk_widget_get_name(GTK_WIDGET(button));
+		if (strcmp(name, "fonts_proportional_sans") == 0)
+			value = "sans-serif";
+		else
+			value = "serif";
+
+		fonts_make_gconf_key(gconf_key, sizeof(gconf_key),
+				     "default", p->fonts_encoding);
+		eel_gconf_set_string(gconf_key, value);
+	}
+}
+
+static void
+fonts_connect_radio (GaleonPrefsDialog *self, GladeXML *gxml,
+		     const char* widget_name, GtkWidget **widget)
+{
+    g_return_if_fail(GLADE_IS_XML(gxml));
+    g_return_if_fail(widget_name != NULL);
+
+    *widget = glade_xml_get_widget(gxml, widget_name);
+    g_return_if_fail(GTK_IS_RADIO_BUTTON(*widget));
+
+    g_signal_connect(G_OBJECT(*widget), "clicked",
+		     G_CALLBACK(on_fonts_radio_changed), self);
+}
+
+static void
 fonts_connect_combo (GaleonPrefsDialog *self, GladeXML *gxml, 
 		     const char *type,
 		     const char *widget_name, GtkWidget **widget)
@@ -1000,10 +1058,15 @@
 		"fonts_encoding_label",
 		NULL);
 
-	gul_glade_gconf_connect_radio (gxml, CONF_RENDERING_DEFAULT_FONT,
-		"fonts_proportional_serif", "0",
-		"fonts_proportional_sans",  "1",
-		NULL);
+	//	gul_glade_gconf_connect_radio (gxml, CONF_RENDERING_DEFAULT_FONT,
+	//		"fonts_proportional_serif", "0",
+	//		"fonts_proportional_sans",  "1",
+	//		NULL);
+
+	fonts_connect_radio (self, gxml, "fonts_proportional_serif",
+			     &p->fonts_default_serif);
+	fonts_connect_radio (self, gxml, "fonts_proportional_sans",
+			     &p->fonts_default_sans);
 
 	fonts_connect_combo (self, gxml, "serif",      "fonts_serif",
 			     &p->fonts_serif);
--- galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp	2008-07-18 06:41:08.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-notifiers.cpp	2008-10-07 01:08:44.000000000 +0200
@@ -409,7 +409,16 @@
 					     key,
 					     (GConfClientNotifyFunc)generic_mozilla_int_notifier,
 					     info);
-		font_infos = g_list_append (font_infos, info);		
+		font_infos = g_list_append (font_infos, info);
+
+		/* default font notifier */
+		sprintf (key, "%s_default_%s", CONF_RENDERING_FONT, language);
+		info = g_strconcat ("font.default", ".", language, NULL);
+		add_notification_and_notify (client,
+					     key,
+					     (GConfClientNotifyFunc)generic_mozilla_string_notifier,
+					     info);
+		font_infos = g_list_append (font_infos, info);
 	}
 }
 
--- galeon-2.0.7.orig/ui/prefs-dialog.glade	2008-07-04 18:30:59.000000000 +0200
+++ galeon-2.0.7/ui/prefs-dialog.glade	2008-10-07 00:59:21.000000000 +0200
@@ -1006,96 +1091,6 @@
 				      <property name="spacing">6</property>
 
 				      <child>
-					<widget class="GtkHBox" id="hbox54">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">6</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="fonts_proportional_label">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Default:</property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox11">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">12</property>
-
-					      <child>
-						<widget class="GtkRadioButton" id="fonts_proportional_serif">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">_Serif</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="fonts_proportional_sans">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">S_ans serif</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						  <property name="group">fonts_proportional_serif</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<placeholder/>
-				      </child>
-
-				      <child>
 					<widget class="GtkHBox" id="hbox55">
 					  <property name="visible">True</property>
 					  <property name="homogeneous">False</property>
@@ -1171,250 +1176,493 @@
 					  </child>
 
 					  <child>
-					    <widget class="GtkTable" id="table5">
+					    <widget class="GtkVBox" id="vbox58">
 					      <property name="visible">True</property>
-					      <property name="n_rows">8</property>
-					      <property name="n_columns">5</property>
 					      <property name="homogeneous">False</property>
-					      <property name="row_spacing">6</property>
-					      <property name="column_spacing">6</property>
+					      <property name="spacing">0</property>
 
 					      <child>
-						<widget class="GtkLabel" id="label19">
+						<widget class="GtkHBox" id="hbox54">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Se_rif:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">fonts_serif</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">6</property>
 
-					      <child>
-						<widget class="GtkLabel" id="label20">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Sa_ns serif:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">fonts_sans</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <child>
+						    <widget class="GtkLabel" id="fonts_proportional_label">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Default:</property>
+						      <property name="use_underline">False</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
 
-					      <child>
-						<widget class="GtkLabel" id="label21">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Monospace:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">fonts_monospace</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <child>
+						    <widget class="GtkHBox" id="hbox11">
+						      <property name="visible">True</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">12</property>
 
-					      <child>
-						<widget class="GtkLabel" id="label25">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Cursi_ve:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">fonts_cursive</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						      <child>
+							<widget class="GtkRadioButton" id="fonts_proportional_serif">
+							  <property name="visible">True</property>
+							  <property name="can_focus">True</property>
+							  <property name="label" translatable="yes">_Serif</property>
+							  <property name="use_underline">True</property>
+							  <property name="relief">GTK_RELIEF_NORMAL</property>
+							  <property name="focus_on_click">True</property>
+							  <property name="active">False</property>
+							  <property name="inconsistent">False</property>
+							  <property name="draw_indicator">True</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
 
-					      <child>
-						<widget class="GtkLabel" id="label26">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Fantasy:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">fonts_fantasy</property>
+						      <child>
+							<widget class="GtkRadioButton" id="fonts_proportional_sans">
+							  <property name="visible">True</property>
+							  <property name="can_focus">True</property>
+							  <property name="label" translatable="yes">S_ans serif</property>
+							  <property name="use_underline">True</property>
+							  <property name="relief">GTK_RELIEF_NORMAL</property>
+							  <property name="focus_on_click">True</property>
+							  <property name="active">False</property>
+							  <property name="inconsistent">False</property>
+							  <property name="draw_indicator">True</property>
+							  <property name="group">fonts_proportional_serif</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">True</property>
+						      <property name="fill">True</property>
+						    </packing>
+						  </child>
 						</widget>
 						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
 						</packing>
 					      </child>
 
 					      <child>
-						<widget class="GtkHBox" id="hbox9">
+						<widget class="GtkTable" id="table5">
 						  <property name="visible">True</property>
+						  <property name="n_rows">8</property>
+						  <property name="n_columns">5</property>
 						  <property name="homogeneous">False</property>
-						  <property name="spacing">6</property>
+						  <property name="row_spacing">6</property>
+						  <property name="column_spacing">6</property>
+
+						  <child>
+						    <widget class="GtkLabel" id="label19">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Se_rif:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">fonts_serif</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">0</property>
+						      <property name="bottom_attach">1</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label20">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Sa_ns serif:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">fonts_sans</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">1</property>
+						      <property name="bottom_attach">2</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label21">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">_Monospace:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">fonts_monospace</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">5</property>
+						      <property name="bottom_attach">6</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label25">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Cursi_ve:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">fonts_cursive</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">2</property>
+						      <property name="bottom_attach">3</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label26">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">_Fantasy:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">fonts_fantasy</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">3</property>
+						      <property name="bottom_attach">4</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkHBox" id="hbox9">
+						      <property name="visible">True</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">6</property>
+
+						      <child>
+							<widget class="GtkSpinButton" id="fonts_monospace_size">
+							  <property name="visible">True</property>
+							  <property name="can_focus">True</property>
+							  <property name="climb_rate">1</property>
+							  <property name="digits">0</property>
+							  <property name="numeric">False</property>
+							  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+							  <property name="snap_to_ticks">False</property>
+							  <property name="wrap">False</property>
+							  <property name="adjustment">16 8 72 1 10 10</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">True</property>
+							  <property name="fill">True</property>
+							</packing>
+						      </child>
+
+						      <child>
+							<widget class="GtkLabel" id="label32">
+							  <property name="visible">True</property>
+							  <property name="label" translatable="yes">points</property>
+							  <property name="use_underline">False</property>
+							  <property name="use_markup">False</property>
+							  <property name="justify">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap">False</property>
+							  <property name="selectable">False</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+							  <property name="width_chars">-1</property>
+							  <property name="single_line_mode">False</property>
+							  <property name="angle">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">4</property>
+						      <property name="right_attach">5</property>
+						      <property name="top_attach">5</property>
+						      <property name="bottom_attach">6</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options">fill</property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label31">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">Si_ze:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">notebook</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">3</property>
+						      <property name="right_attach">4</property>
+						      <property name="top_attach">5</property>
+						      <property name="bottom_attach">6</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkHBox" id="hbox14">
+						      <property name="visible">True</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">6</property>
+
+						      <child>
+							<widget class="GtkSpinButton" id="fonts_minimum_size">
+							  <property name="visible">True</property>
+							  <property name="can_focus">True</property>
+							  <property name="climb_rate">1</property>
+							  <property name="digits">0</property>
+							  <property name="numeric">False</property>
+							  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+							  <property name="snap_to_ticks">False</property>
+							  <property name="wrap">False</property>
+							  <property name="adjustment">16 4 48 1 10 10</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">True</property>
+							  <property name="fill">True</property>
+							</packing>
+						      </child>
+
+						      <child>
+							<widget class="GtkLabel" id="label39">
+							  <property name="visible">True</property>
+							  <property name="label" translatable="yes">points</property>
+							  <property name="use_underline">False</property>
+							  <property name="use_markup">False</property>
+							  <property name="justify">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap">False</property>
+							  <property name="selectable">False</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+							  <property name="width_chars">-1</property>
+							  <property name="single_line_mode">False</property>
+							  <property name="angle">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">4</property>
+						      <property name="right_attach">5</property>
+						      <property name="top_attach">7</property>
+						      <property name="bottom_attach">8</property>
+						      <property name="x_options">fill</property>
+						    </packing>
+						  </child>
 
 						  <child>
-						    <widget class="GtkSpinButton" id="fonts_monospace_size">
+						    <widget class="GtkLabel" id="label41">
 						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
+						      <property name="label" translatable="yes"></property>
+						      <property name="use_underline">False</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
-						      <property name="adjustment">16 8 72 1 10 10</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">True</property>
-						      <property name="fill">True</property>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">2</property>
+						      <property name="top_attach">4</property>
+						      <property name="bottom_attach">5</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
 
 						  <child>
-						    <widget class="GtkLabel" id="label32">
+						    <widget class="GtkLabel" id="label42">
 						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">points</property>
+						      <property name="label" translatable="yes"></property>
 						      <property name="use_underline">False</property>
 						      <property name="use_markup">False</property>
 						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
 						      <property name="selectable">False</property>
-						      <property name="xalign">0.5</property>
+						      <property name="xalign">0</property>
 						      <property name="yalign">0.5</property>
 						      <property name="xpad">0</property>
 						      <property name="ypad">0</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
+						      <property name="left_attach">0</property>
+						      <property name="right_attach">1</property>
+						      <property name="top_attach">6</property>
+						      <property name="bottom_attach">7</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">4</property>
-						  <property name="right_attach">5</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label31">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Si_ze:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">notebook</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">3</property>
-						  <property name="right_attach">4</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox14">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">6</property>
 
 						  <child>
-						    <widget class="GtkSpinButton" id="fonts_minimum_size">
+						    <widget class="GtkLabel" id="label38">
 						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
+						      <property name="label" translatable="yes">Minimum siz_e:</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
-						      <property name="adjustment">16 4 48 1 10 10</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">1</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">notebook</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">True</property>
-						      <property name="fill">True</property>
+						      <property name="left_attach">2</property>
+						      <property name="right_attach">4</property>
+						      <property name="top_attach">7</property>
+						      <property name="bottom_attach">8</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
 
 						  <child>
-						    <widget class="GtkLabel" id="label39">
+						    <widget class="GtkLabel" id="label29">
 						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">points</property>
-						      <property name="use_underline">False</property>
+						      <property name="label" translatable="yes">S_ize:</property>
+						      <property name="use_underline">True</property>
 						      <property name="use_markup">False</property>
 						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
@@ -1423,244 +1671,166 @@
 						      <property name="yalign">0.5</property>
 						      <property name="xpad">0</property>
 						      <property name="ypad">0</property>
+						      <property name="mnemonic_widget">notebook</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
+						      <property name="left_attach">3</property>
+						      <property name="right_attach">4</property>
+						      <property name="top_attach">0</property>
+						      <property name="bottom_attach">1</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">4</property>
-						  <property name="right_attach">5</property>
-						  <property name="top_attach">7</property>
-						  <property name="bottom_attach">8</property>
-						  <property name="x_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label41">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes"></property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">4</property>
-						  <property name="bottom_attach">5</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label42">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes"></property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">6</property>
-						  <property name="bottom_attach">7</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
 
-					      <child>
-						<widget class="GtkLabel" id="label38">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Minimum siz_e:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">1</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">notebook</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">2</property>
-						  <property name="right_attach">4</property>
-						  <property name="top_attach">7</property>
-						  <property name="bottom_attach">8</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <child>
+						    <widget class="GtkHBox" id="hbox8">
+						      <property name="visible">True</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">6</property>
 
-					      <child>
-						<widget class="GtkLabel" id="label29">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">S_ize:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">notebook</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">3</property>
-						  <property name="right_attach">4</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						      <child>
+							<widget class="GtkSpinButton" id="fonts_proportional_size">
+							  <property name="visible">True</property>
+							  <property name="can_focus">True</property>
+							  <property name="climb_rate">1</property>
+							  <property name="digits">0</property>
+							  <property name="numeric">False</property>
+							  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+							  <property name="snap_to_ticks">False</property>
+							  <property name="wrap">False</property>
+							  <property name="adjustment">16 8 72 1 10 10</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">True</property>
+							  <property name="fill">True</property>
+							</packing>
+						      </child>
 
-					      <child>
-						<widget class="GtkHBox" id="hbox8">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">6</property>
+						      <child>
+							<widget class="GtkLabel" id="label30">
+							  <property name="visible">True</property>
+							  <property name="label" translatable="yes">points</property>
+							  <property name="use_underline">False</property>
+							  <property name="use_markup">False</property>
+							  <property name="justify">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap">False</property>
+							  <property name="selectable">False</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+							  <property name="width_chars">-1</property>
+							  <property name="single_line_mode">False</property>
+							  <property name="angle">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">4</property>
+						      <property name="right_attach">5</property>
+						      <property name="top_attach">0</property>
+						      <property name="bottom_attach">1</property>
+						      <property name="x_options">fill</property>
+						      <property name="y_options">fill</property>
+						    </packing>
+						  </child>
 
 						  <child>
-						    <widget class="GtkSpinButton" id="fonts_proportional_size">
+						    <widget class="GtkComboBox" id="fonts_serif">
 						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
-						      <property name="wrap">False</property>
-						      <property name="adjustment">16 8 72 1 10 10</property>
+						      <property name="items" translatable="yes">DYNAMIC</property>
+						      <property name="add_tearoffs">False</property>
+						      <property name="focus_on_click">True</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">True</property>
-						      <property name="fill">True</property>
+						      <property name="left_attach">1</property>
+						      <property name="right_attach">3</property>
+						      <property name="top_attach">0</property>
+						      <property name="bottom_attach">1</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
 
 						  <child>
-						    <widget class="GtkLabel" id="label30">
+						    <widget class="GtkComboBox" id="fonts_sans">
 						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">points</property>
-						      <property name="use_underline">False</property>
-						      <property name="use_markup">False</property>
-						      <property name="justify">GTK_JUSTIFY_LEFT</property>
-						      <property name="wrap">False</property>
-						      <property name="selectable">False</property>
-						      <property name="xalign">0.5</property>
-						      <property name="yalign">0.5</property>
-						      <property name="xpad">0</property>
-						      <property name="ypad">0</property>
+						      <property name="items" translatable="yes">DYNAMIC</property>
+						      <property name="add_tearoffs">False</property>
+						      <property name="focus_on_click">True</property>
 						    </widget>
 						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
+						      <property name="left_attach">1</property>
+						      <property name="right_attach">3</property>
+						      <property name="top_attach">1</property>
+						      <property name="bottom_attach">2</property>
+						      <property name="y_options"></property>
 						    </packing>
 						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">4</property>
-						  <property name="right_attach">5</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkComboBox" id="fonts_serif">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">DYNAMIC</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkComboBox" id="fonts_sans">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">DYNAMIC</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
 
-					      <child>
-						<widget class="GtkComboBox" id="fonts_cursive">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">DYNAMIC</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <child>
+						    <widget class="GtkComboBox" id="fonts_cursive">
+						      <property name="visible">True</property>
+						      <property name="items" translatable="yes">DYNAMIC</property>
+						      <property name="add_tearoffs">False</property>
+						      <property name="focus_on_click">True</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">1</property>
+						      <property name="right_attach">3</property>
+						      <property name="top_attach">2</property>
+						      <property name="bottom_attach">3</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
 
-					      <child>
-						<widget class="GtkComboBox" id="fonts_fantasy">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">DYNAMIC</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
+						  <child>
+						    <widget class="GtkComboBox" id="fonts_fantasy">
+						      <property name="visible">True</property>
+						      <property name="items" translatable="yes">DYNAMIC</property>
+						      <property name="add_tearoffs">False</property>
+						      <property name="focus_on_click">True</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">1</property>
+						      <property name="right_attach">3</property>
+						      <property name="top_attach">3</property>
+						      <property name="bottom_attach">4</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
 
-					      <child>
-						<widget class="GtkComboBox" id="fonts_monospace">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">DYNAMIC</property>
+						  <child>
+						    <widget class="GtkComboBox" id="fonts_monospace">
+						      <property name="visible">True</property>
+						      <property name="items" translatable="yes">DYNAMIC</property>
+						      <property name="add_tearoffs">False</property>
+						      <property name="focus_on_click">True</property>
+						    </widget>
+						    <packing>
+						      <property name="left_attach">1</property>
+						      <property name="right_attach">3</property>
+						      <property name="top_attach">5</property>
+						      <property name="bottom_attach">6</property>
+						      <property name="y_options"></property>
+						    </packing>
+						  </child>
 						</widget>
 						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="y_options"></property>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
 						</packing>
 					      </child>
 					    </widget>
