gtkhtml r8730 - branches/mbarnes-composer/components/editor

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Feb 11 05:06:06 2008
New Revision: 8730
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8730&view=rev

Log:
Fix a crash that occurs when initializing the editor to plain-text mode.


Modified:
   branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor.c

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-private.c	Mon Feb 11 05:06:06 2008
@@ -152,6 +152,7 @@
 	/* Initialize painters (requires "edit_area"). */
 
 	html = gtkhtml_editor_get_html (editor);
+	gtk_widget_ensure_style (GTK_WIDGET (html));
 	priv->html_painter = g_object_ref (html->engine->painter);
 	priv->plain_painter = html_plain_painter_new (priv->edit_area, TRUE);
 

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.c	Mon Feb 11 05:06:06 2008
@@ -500,12 +500,6 @@
 		editor->priv->text_color, "notify::current-color",
 		editor_text_color_changed_cb, editor);
 
-	/* XXX Leave the default state for HTML mode as TRUE since the
-	 *     HTML painter is already installed.  Setting the default
-	 *     to FALSE causes a crash when swapping painters in the
-	 *     "html_mode" action during initialization.  I've yet to
-	 *     figure out why. (mbarnes) */
-
 	gtkhtml_editor_set_html_mode (editor, TRUE);
 	gtk_widget_grab_focus (editor->priv->edit_area);
 
@@ -528,7 +522,7 @@
 		case PROP_FILENAME:
 			gtkhtml_editor_set_filename (
 				GTKHTML_EDITOR (object),
-				g_value_get_boolean (value));
+				g_value_get_string (value));
 			return;
 
 		case PROP_HTML_MODE: