From 001945d86b2f69434efc67ff74e568c15c596fea Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 5 Jan 2009 18:40:19 +0100
Subject: [PATCH] Revisit the failed attempt to correct MidoriView

---
 midori/midori-view.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 9bd03bec..0ee35119 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1402,17 +1402,19 @@ midori_view_set_settings (MidoriView*        view,
         return;
 
     if (view->settings)
-    {
         g_signal_handlers_disconnect_by_func (view->settings,
             midori_view_settings_notify_cb, view);
+
+    katze_object_assign (view->settings, settings);
+    if (settings)
+    {
         g_object_ref (settings);
         if (view->web_view)
-            g_object_set (view->web_view, "settings", view->settings, NULL);
+            g_object_set (view->web_view, "settings", settings, NULL);
         _midori_view_update_settings (view);
         g_signal_connect (settings, "notify",
             G_CALLBACK (midori_view_settings_notify_cb), view);
     }
-    katze_object_assign (view->settings, settings);
     g_object_notify (G_OBJECT (view), "settings");
 }