[Xfce4-commits] <midori:master> Check that trash is set before connecting clear

[Christian Dywan]

Updating branch refs/heads/master
         to d74aac33ccd0bec4fea5e601b0f3fea955717fb6 (commit)
       from 2172d5def75ea776740ef94c3a2a738da30aa92c (commit)

commit d74aac33ccd0bec4fea5e601b0f3fea955717fb6
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Nov 23 00:36:39 2012 +0100

    Check that trash is set before connecting clear

 midori/midori-browser.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 03dfb9a..1ad0218 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -7257,9 +7257,12 @@ midori_browser_set_property (GObject*      object,
                       NULL);
         _action_set_visible (browser, "Trash", browser->trash != NULL);
         _action_set_visible (browser, "UndoTabClose", browser->trash != NULL);
-        g_signal_connect (browser->trash, "clear",
-            G_CALLBACK (midori_browser_trash_clear_cb), browser);
-        midori_browser_trash_clear_cb (browser->trash, browser);
+        if (browser->trash != NULL)
+        {
+            g_signal_connect (browser->trash, "clear",
+                G_CALLBACK (midori_browser_trash_clear_cb), browser);
+            midori_browser_trash_clear_cb (browser->trash, browser);
+        }
         break;
     case PROP_SEARCH_ENGINES:
     {