[evolution/webkit-composer-rebased: 100/105] Bug #689783 - Negative font size does nothing, keeps +0

[Matthew Barnes <mbarnes src gnome org>]

commit 11cf6532cf9746fa157dc68378434ea2b9cfa535
Author: Dan VrÃtil <dvratil redhat com>
Date:   Sun Dec 9 20:26:49 2012 +0100

    Bug #689783 - Negative font size does nothing, keeps +0
    
    Don't set minimum-font-size in WebKitWebSettings. This option
    makes sense only when displaying emails, because there user
    can't change the font size.In composer however the font size
    is under full control of the user.

 e-util/e-editor-actions.c |    2 +-
 e-util/e-editor-widget.c  |    9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index 01b87ac..6fb61f5 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -1821,7 +1821,7 @@ editor_actions_init (EEditor *editor)
 		G_N_ELEMENTS (core_style_entries),
 		E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH,
 		NULL, NULL);
-	gtk_ui_manager_insert_action_group (manager, action_group, 0);\
+	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 
 	action = gtk_action_group_get_action (action_group, "mode-html");
 	g_object_bind_property (
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index 9f00be0..e5bb5e2 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -1671,7 +1671,7 @@ e_editor_widget_update_fonts (EEditorWidget *widget)
 	gchar *base64;
 	gchar *aa = NULL;
 	WebKitWebSettings *settings;
-	PangoFontDescription *min_size, *ms, *vw;
+	PangoFontDescription *ms, *vw;
 	const gchar *styles[] = { "normal", "oblique", "italic" };
 	const gchar *smoothing = NULL;
 	GtkStyleContext *context;
@@ -1698,12 +1698,6 @@ e_editor_widget_update_fonts (EEditorWidget *widget)
 		vw = pango_font_description_copy (ms);
 	}
 
-	if (pango_font_description_get_size (ms) < pango_font_description_get_size (vw)) {
-		min_size = ms;
-	} else {
-		min_size = vw;
-	}
-
 	stylesheet = g_string_new ("");
 	g_string_append_printf (stylesheet,
 		"body {\n"
@@ -1791,7 +1785,6 @@ e_editor_widget_update_fonts (EEditorWidget *widget)
 		"default-font-family", pango_font_description_get_family (vw),
 		"monospace-font-family", pango_font_description_get_family (ms),
 		"default-monospace-font-size", (pango_font_description_get_size (ms) / PANGO_SCALE),
-		"minimum-font-size", (pango_font_description_get_size (min_size) / PANGO_SCALE),
 		"user-stylesheet-uri", stylesheet->str,
 		NULL);