From 5b2380433ba4b44113562c2c50b0a42b29beda8d Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 28 Feb 2009 14:03:23 +0100 Subject: [PATCH] Only apply settings on the web view if we actually have any --- midori/midori-view.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 928e39e8..2b0a2023 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -1602,10 +1602,14 @@ midori_view_construct_web_view (MidoriView* view) webkit_web_frame_load_done_cb, view, NULL); - g_object_set (view->web_view, "settings", view->settings, NULL); - if (katze_object_has_property (view->web_view, "full-content-zoom")) - g_object_set (view->web_view, "full-content-zoom", - katze_object_get_boolean (view->settings, "zoom-text-and-images"), NULL); + if (view->settings) + { + g_object_set (view->web_view, "settings", view->settings, NULL); + if (katze_object_has_property (view->web_view, "full-content-zoom")) + g_object_set (view->web_view, "full-content-zoom", + katze_object_get_boolean (view->settings, + "zoom-text-and-images"), NULL); + } gtk_widget_show (view->web_view); gtk_container_add (GTK_CONTAINER (view), view->web_view);