Merge lp:~aauzi/midori/fix-1184716 into lp:midori

[André Auzi]

Implements context popup menu on menu entries of bookmark bar and bookmark menu.

(For review: doesn't depend on other branches)

Implements context popup menu on menu entries of bookmark bar and bookmark menu.

[Cris Dywan (kalikiana)]

To be frank there's 3 places in the code that look very evil to me:
a) constructing events when event is NULL
As mentioned on IRC this may be better solved by introducing a context-menu signal and pushing the event handling into KatzeArrayAction. Faking events is something to avoid when you can and this feels like bending over backwards for supporting the API.

b) pointer_in_menu_window
Not sure what the exact situation is. Can't we get a widget from the event?

c) gtk_window_list_toplevels to find a browser
I don't see how the code verifies that the given window is the correct one.
Maybe try midori_browser_get_for_widget? At least check what the original "browser" is in that situation.

review: Needs Information

[lp:~aauzi/midori/fix-1184716]

6184. By André Auzi on 2013-12-26

merge lp:midori and build with Gtk3

6185. By André Auzi on 2013-12-26

simplify things by an straight forward evolution of activate-item-alt

6186. By André Auzi on 2013-12-26

select correct marshalling and update comment

[André Auzi (aauzi)]

> To be frank there's 3 places in the code that look very evil to me:
> a) constructing events when event is NULL
> As mentioned on IRC this may be better solved by introducing a context-menu
> signal and pushing the event handling into KatzeArrayAction. Faking events is
> something to avoid when you can and this feels like bending over backwards for
> supporting the API.

It's good to come back later and review things with some distance.

It looks like a much simple evolution of activate-item-alt is enough to achieve the expected behavior.

> b) pointer_in_menu_window
> Not sure what the exact situation is. Can't we get a widget from the event?

it's not necessary for what I'm expecting nowadays, I got rid of it.

> c) gtk_window_list_toplevels to find a browser
> I don't see how the code verifies that the given window is the correct one.
> Maybe try midori_browser_get_for_widget? At least check what the original
> "browser" is in that situation.

it actually is an evolution of midori_browser_get_for_widget.
I've added a check of ancestor.
It works fine with multiple browser windows.

[Cris Dywan (kalikiana)]

Got confirmation from others on IRC that it works well (always good to have since I personally hardly use bookmarks), tested with trunk, so let's see if tarmac gets this in without another update.

review: Approve

=== modified file 'katze/katze-arrayaction.c'
--- katze/katze-arrayaction.c	2012-12-16 18:40:00 +0000
+++ katze/katze-arrayaction.c	2013-12-26 17:42:30 +0000
@@ -159,15 +159,14 @@
     /**
      * KatzeArrayAction::activate-item-alt:
      * @array: the object on which the signal is emitted
+     * @proxy: the %GtkWidget that caught the event
      * @item: the item being activated
-     * @button: the mouse button pressed
+     * @event: the mouse button pressed event
      *
      * An item was clicked, with the specified @button.
      *
      * Return value: %TRUE if the event was handled. If %FALSE is returned,
      *               the default "activate-item" signal is emitted.
-     *
-     * Since: 0.1.7
      **/
     signals[ACTIVATE_ITEM_ALT] = g_signal_new ("activate-item-alt",
                                        G_TYPE_FROM_CLASS (class),
@@ -175,9 +174,9 @@
                                        0,
                                        0,
                                        NULL,
-                                       midori_cclosure_marshal_BOOLEAN__OBJECT_UINT,
-                                       G_TYPE_BOOLEAN, 2,
-                                       KATZE_TYPE_ITEM, G_TYPE_UINT);
+				       midori_cclosure_marshal_BOOLEAN__OBJECT_OBJECT_POINTER,
+				       G_TYPE_BOOLEAN, 3,
+                                       KATZE_TYPE_ITEM, GTK_TYPE_WIDGET, G_TYPE_POINTER);
 
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = katze_array_action_finalize;
@@ -287,14 +286,33 @@
 
 static void
 katze_array_action_activate_item (KatzeArrayAction* action,
-                                  KatzeItem*        item,
-                                  gint              button)
-{
+                                  KatzeItem*        item)
+{
+    g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item);
+}
+
+static gboolean
+katze_array_action_activate_item_alt (KatzeArrayAction* action,
+                                      KatzeItem*        item,
+                                      GdkEventButton*   event,
+                                      GtkWidget*        proxy)
+{
+    /* katze_array_action_activate_item emits the signal.
+     * It can result from "clicked" event where the button event
+     * is not provided.
+     */
+
     gboolean handled = FALSE;
+
+    g_assert (event);
+
     g_signal_emit (action, signals[ACTIVATE_ITEM_ALT], 0, item,
-                   button, &handled);
+                       proxy, event, &handled);
+
     if (!handled)
-        g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item);
+        katze_array_action_activate_item (action, item);
+
+    return handled;
 }
 
 static void
@@ -302,7 +320,18 @@
                                       KatzeArrayAction* array_action)
 {
     KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
-    katze_array_action_activate_item (array_action, item, 1);
+
+    katze_array_action_activate_item (array_action, item);
+}
+
+static gboolean
+katze_array_action_menu_item_button_press_cb (GtkWidget*        proxy,
+                                              GdkEventButton*   event,
+                                              KatzeArrayAction* array_action)
+{
+    KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
+
+    return katze_array_action_activate_item_alt (array_action, item, event, proxy);
 }
 
 static gboolean
@@ -310,22 +339,70 @@
                                          GdkEventButton*   event,
                                          KatzeArrayAction* array_action)
 {
-    KatzeItem* item = g_object_get_data (G_OBJECT (proxy), "KatzeItem");
-
-    katze_array_action_activate_item (array_action, item, event->button);
-
-    /* we need to block the 'activate' handler which would be called
-     * otherwise as well */
-    g_signal_handlers_block_by_func (proxy,
-        katze_array_action_menu_activate_cb, array_action);
-
-    return TRUE;
+    /* Take precedence over menu button-press-event handling to avoid
+       menu item activation and menu disparition for popup opening
+    */
+
+    return katze_array_action_menu_item_button_press_cb (gtk_get_event_widget ((GdkEvent *) event), event, array_action);
+}
+
+static gboolean
+katze_array_action_tool_item_child_button_press_cb (GtkWidget*        proxy,
+                                                                            GdkEventButton*   event,
+                                                                            KatzeArrayAction* array_action)
+{
+    GtkWidget* toolitem = gtk_widget_get_parent (proxy);
+    KatzeItem* item = g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
+
+    /* let the 'clicked' signal be processed normally */
+    if (event->button == 1)
+        return FALSE;
+
+    return katze_array_action_activate_item_alt (array_action, item, event, proxy);
 }
 
 static void
 katze_array_action_menu_item_select_cb (GtkWidget*        proxy,
                                         KatzeArrayAction* array_action);
 
+static GtkWidget*
+katze_array_action_menu_item_new (KatzeArrayAction* array_action,
+                                  KatzeItem* item)
+{
+    GtkWidget* menuitem = katze_image_menu_item_new_ellipsized (
+        katze_item_get_name (item));
+    GtkWidget* image = katze_item_get_image (item, menuitem);
+
+    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+    gtk_image_menu_item_set_always_show_image (
+        GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
+
+    g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
+
+    if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        GtkWidget* submenu = gtk_menu_new ();
+        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+        g_signal_connect (submenu, "button-press-event",
+            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
+        g_signal_connect (menuitem, "select",
+            G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
+        g_signal_connect (menuitem, "activate",
+            G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
+    }
+    else
+    {
+        /* we need the 'activate' signal as well for keyboard events */
+        g_signal_connect (menuitem, "activate",
+            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
+    }
+
+    g_signal_connect (menuitem, "button-press-event",
+        G_CALLBACK (katze_array_action_menu_item_button_press_cb), array_action);
+
+    return menuitem;
+}
+
 /**
  * katze_array_action_generate_menu:
  * @array_action: a #KatzeArrayAction
@@ -355,15 +432,13 @@
     gint summand;
     KatzeItem* item;
     GtkWidget* menuitem;
-    GtkWidget* image;
-    GtkWidget* submenu;
 
     g_return_if_fail (KATZE_IS_ARRAY_ACTION (array_action));
     g_return_if_fail (KATZE_IS_ITEM (array));
     g_return_if_fail (GTK_IS_MENU_SHELL (menu));
     g_return_if_fail (GTK_IS_TOOL_ITEM (proxy)
-                   || GTK_IS_MENU_ITEM (proxy)
-                   || GTK_IS_WINDOW (proxy));
+        || GTK_IS_MENU_ITEM (proxy)
+        || GTK_IS_WINDOW (proxy));
 
     if (!KATZE_IS_ARRAY (array))
         return;
@@ -388,35 +463,19 @@
             gtk_menu_shell_append (menu, menuitem);
             continue;
         }
-        menuitem = katze_image_menu_item_new_ellipsized (
-            katze_item_get_name (item));
-        image = katze_item_get_image (item, menuitem);
-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-        gtk_image_menu_item_set_always_show_image (
-            GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-        gtk_menu_shell_append (menu, menuitem);
-        g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
+
+        menuitem = katze_array_action_menu_item_new (array_action, item);
+
         if (KATZE_ITEM_IS_FOLDER (item))
         {
-            submenu = gtk_menu_new ();
-            gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+            GtkWidget* submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menuitem));
             /* Make sure menu appears to contain items */
             gtk_menu_shell_append (GTK_MENU_SHELL (submenu),
                 gtk_separator_menu_item_new ());
-            g_signal_connect (menuitem, "select",
-                G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
-            g_signal_connect (menuitem, "activate",
-                G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
-        }
-        else
-        {
-            /* we need the 'activate' signal as well for keyboard events */
-            g_signal_connect (menuitem, "activate",
-                G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
-        }
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
+        }
+
         gtk_widget_show (menuitem);
+        gtk_menu_shell_append (menu, menuitem);
     }
 }
 
@@ -444,7 +503,7 @@
     katze_array_action_generate_menu (array_action, array, GTK_MENU_SHELL (menu), proxy);
     g_signal_emit (array_action, signals[POPULATE_FOLDER], 0, menu, array, &handled);
     g_object_set_data (G_OBJECT (proxy), "last-update",
-                       GINT_TO_POINTER (time (NULL)));
+        GINT_TO_POINTER (time (NULL)));
     return TRUE;
 }
 
@@ -476,13 +535,14 @@
     gboolean handled = FALSE;
 
     array = (KatzeArray*)g_object_get_data (G_OBJECT (proxy), "KatzeItem");
+
     if (GTK_IS_MENU_ITEM (proxy))
     {
         if (katze_array_action_menu_item_need_update (array_action, proxy))
         {
             g_signal_emit (array_action, signals[POPULATE_FOLDER], 0,
-                           gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)),
-                           array, &handled);
+                gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)),
+                array, &handled);
             if (!handled)
                 g_signal_emit (array_action, signals[POPULATE_POPUP], 0,
                     gtk_menu_item_get_submenu (GTK_MENU_ITEM (proxy)));
@@ -492,7 +552,7 @@
 
     if (KATZE_IS_ITEM (array) && katze_item_get_uri ((KatzeItem*)array))
     {
-        katze_array_action_activate_item (array_action, KATZE_ITEM (array), 1);
+        katze_array_action_activate_item (array_action, KATZE_ITEM (array));
         return;
     }
 
@@ -512,7 +572,7 @@
     }
 
     katze_widget_popup (GTK_WIDGET (proxy), GTK_MENU (menu),
-                        NULL, KATZE_MENU_POSITION_LEFT);
+        NULL, KATZE_MENU_POSITION_LEFT);
     gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), TRUE);
     g_object_set_data (G_OBJECT (menu), "KatzeArrayAction", array_action);
     g_signal_connect (menu, "deactivate",
@@ -606,31 +666,9 @@
 {
     KatzeArrayAction* array_action;
     GtkWidget* menuitem;
-    GtkWidget* image;
 
     array_action = g_object_get_data (G_OBJECT (proxy), "KatzeArrayAction");
-    menuitem = katze_image_menu_item_new_ellipsized (
-        katze_item_get_name (item));
-    image = katze_item_get_image (item, menuitem);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    gtk_image_menu_item_set_always_show_image (
-        GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-    g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    if (KATZE_ITEM_IS_FOLDER (item))
-    {
-        GtkWidget* submenu = gtk_menu_new ();
-        gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-        g_signal_connect (menuitem, "select",
-            G_CALLBACK (katze_array_action_menu_item_select_cb), array_action);
-    }
-    else
-    {
-        g_signal_connect (menuitem, "button-press-event",
-            G_CALLBACK (katze_array_action_menu_button_press_cb), array_action);
-        /* we need the 'activate' signal as well for keyboard events */
-        g_signal_connect (menuitem, "activate",
-            G_CALLBACK (katze_array_action_menu_activate_cb), array_action);
-    }
+    menuitem = katze_array_action_menu_item_new (array_action, item);
     gtk_tool_item_set_proxy_menu_item (GTK_TOOL_ITEM (proxy),
         "katze-tool-item-menu", menuitem);
     return TRUE;
@@ -706,9 +744,19 @@
     else
         gtk_tool_item_set_tooltip_text (toolitem, uri);
 
-    g_object_set_data (G_OBJECT (toolitem), "KatzeArray", item);
+    g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
     g_signal_connect (toolitem, "clicked",
         G_CALLBACK (katze_array_action_proxy_clicked_cb), array_action);
+    if (KATZE_IS_ITEM (item))
+    {
+        /* Tool items block the "button-press-event" but we can get it
+         * when connecting it to the tool item's child widget
+         */
+
+        GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
+        g_signal_connect (child, "button-press-event",
+            G_CALLBACK (katze_array_action_tool_item_child_button_press_cb), array_action);
+    }
 
     g_object_set_data (G_OBJECT (toolitem), "KatzeArrayAction", array_action);
     g_signal_connect (item, "notify",
@@ -779,11 +827,11 @@
 
     /* FIXME: Add and remove items dynamically */
     /*g_object_connect (array,
-        "signal-after::add-item",
-        katze_array_action_engines_add_item_cb, array_action,
-        "signal-after::remove-item",
-        katze_array_action_engines_remove_item_cb, array_action,
-        NULL);*/
+      "signal-after::add-item",
+      katze_array_action_engines_add_item_cb, array_action,
+      "signal-after::remove-item",
+      katze_array_action_engines_remove_item_cb, array_action,
+      NULL);*/
 
     g_object_notify (G_OBJECT (array_action), "array");
 

=== modified file 'midori/marshal.list'
--- midori/marshal.list	2013-09-03 14:45:17 +0000
+++ midori/marshal.list	2013-12-26 17:42:30 +0000
@@ -1,6 +1,6 @@
 BOOLEAN:OBJECT
 BOOLEAN:OBJECT,OBJECT
-BOOLEAN:OBJECT,UINT
+BOOLEAN:OBJECT,OBJECT,POINTER
 BOOLEAN:VOID
 BOOLEAN:STRING
 OBJECT:OBJECT

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-12-18 23:41:05 +0000
+++ midori/midori-browser.c	2013-12-26 17:42:30 +0000
@@ -916,7 +916,7 @@
             folders = g_list_append (folders, folder);
         }
 
-       	sqlite3_clear_bindings (statement);
+        sqlite3_clear_bindings (statement);
         sqlite3_reset (statement);
     }
 
@@ -2979,18 +2979,31 @@
     return TRUE;
 }
 
+static void
+midori_browser_bookmark_popup (GtkWidget*      proxy,
+                               GdkEventButton* event,
+                               KatzeItem*      item,
+                               MidoriBrowser*  browser);
+
 static gboolean
-midori_bookmarkbar_activate_item_alt (GtkAction*     action,
-                                      KatzeItem*     item,
-                                      guint          button,
-                                      MidoriBrowser* browser)
+midori_bookmarkbar_activate_item_alt (GtkAction*      action,
+                                      KatzeItem*      item,
+                                      GtkWidget*      proxy,
+                                      GdkEventButton* event,
+                                      MidoriBrowser*  browser)
 {
-    if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
+    g_assert (event);
+
+    if (MIDORI_EVENT_NEW_TAB (event))
     {
         GtkWidget* view = midori_browser_add_item (browser, item);
         midori_browser_set_current_tab_smartly (browser, view);
     }
-    else if (button == 1)
+    else if (MIDORI_EVENT_CONTEXT_MENU (event))
+    {
+        midori_browser_bookmark_popup (proxy, NULL, item, browser);
+    }
+    else if (event->button == 1)
     {
         midori_browser_open_bookmark (browser, item);
     }
@@ -3028,17 +3041,20 @@
 }
 
 static gboolean
-_action_trash_activate_item_alt (GtkAction*     action,
-                                 KatzeItem*     item,
-                                 guint          button,
-                                 MidoriBrowser* browser)
+_action_trash_activate_item_alt (GtkAction*      action,
+                                 KatzeItem*      item,
+                                 GtkWidget*      proxy,
+                                 GdkEventButton* event,
+                                 MidoriBrowser*  browser)
 {
-    if (MIDORI_EVENT_NEW_TAB (gtk_get_current_event ()))
+    g_assert (event);
+
+    if (MIDORI_EVENT_NEW_TAB (event))
     {
         midori_browser_set_current_tab_smartly (browser,
             midori_browser_restore_tab (browser, item));
     }
-    else if (button == 1)
+    else if (event->button == 1)
     {
         midori_browser_set_current_tab (browser,
             midori_browser_restore_tab (browser, item));
@@ -3095,12 +3111,6 @@
     midori_context_action_create_menu (menu, default_menu, TRUE);
 }
 
-static void
-midori_browser_bookmark_popup (GtkWidget*      widget,
-                               GdkEventButton* event,
-                               KatzeItem*      item,
-                               MidoriBrowser*  browser);
-
 static gboolean
 _action_bookmarks_populate_folder (GtkAction*     action,
                                    GtkMenuShell*  menu,
@@ -3174,10 +3184,11 @@
 }
 
 static void
-_action_window_activate_item_alt (GtkAction*     action,
-                                  KatzeItem*     item,
-                                  gint           button,
-                                  MidoriBrowser* browser)
+_action_window_activate_item_alt (GtkAction*      action,
+                                  KatzeItem*      item,
+                                  GtkWidget*      proxy,
+                                  GdkEventButton* event,
+                                  MidoriBrowser*  browser)
 {
     midori_browser_set_current_item (browser, item);
 }
@@ -4238,6 +4249,9 @@
        it is an item, we forward it to the actual widget. */
     if ((GTK_IS_BOX (toolitem) || GTK_IS_MENU_BAR (toolitem)))
     {
+        if (gtk_widget_get_window (toolitem) != event->window)
+            return FALSE;
+
         midori_browser_toolbar_popup_context_menu_cb (
             GTK_IS_BIN (toolitem) && gtk_bin_get_child (GTK_BIN (toolitem)) ?
                 gtk_widget_get_parent (toolitem) : toolitem,
@@ -5876,8 +5890,6 @@
     g_object_connect (action,
                       "signal::populate-popup",
                       _action_tools_populate_popup, browser,
-                      "signal::activate-item-alt",
-                      midori_bookmarkbar_activate_item_alt, browser,
                       NULL);
     gtk_action_group_add_action (browser->action_group, action);
     g_object_unref (action);
@@ -6599,29 +6611,6 @@
     g_value_unset (&value);
 }
 
-static gboolean
-midori_bookmarkbar_item_button_press_event_cb (GtkWidget*      toolitem,
-                                               GdkEventButton* event,
-                                               MidoriBrowser*  browser)
-{
-    KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (toolitem), "KatzeItem");
-    if (MIDORI_EVENT_NEW_TAB (event))
-    {
-        if (KATZE_ITEM_IS_BOOKMARK (item))
-        {
-            GtkWidget* view = midori_browser_add_uri (browser, katze_item_get_uri (item));
-            midori_browser_set_current_tab_smartly (browser, view);
-            return TRUE;
-        }
-    }
-    else if (MIDORI_EVENT_CONTEXT_MENU (event))
-    {
-        midori_browser_bookmark_popup (toolitem, NULL, item, browser);
-        return TRUE;
-    }
-    return FALSE;
-}
-
 static void
 midori_bookmarkbar_insert_item (GtkWidget* toolbar,
                                 KatzeItem* item)
@@ -6632,15 +6621,7 @@
         KATZE_ARRAY_ACTION (action), item);
     g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
 
-    if (KATZE_IS_ITEM (item))
-    {
-        GtkWidget* child = gtk_bin_get_child (GTK_BIN (toolitem));
-        g_object_set_data (G_OBJECT (child), "KatzeItem", item);
-        g_signal_connect (child, "button-press-event",
-            G_CALLBACK (midori_bookmarkbar_item_button_press_event_cb),
-            browser);
-    }
-    else /* Separator */
+    if (!KATZE_IS_ITEM (item)) /* Separator */
         gtk_tool_item_set_use_drag_window (toolitem, TRUE);
 
     gtk_widget_show (GTK_WIDGET (toolitem));
@@ -6649,13 +6630,13 @@
 
 static void
 midori_bookmarkbar_add_item_cb (KatzeArray*    bookmarks,
-				KatzeItem*     item,
-				MidoriBrowser* browser)
+                                KatzeItem*     item,
+                                MidoriBrowser* browser)
 {
     if (gtk_widget_get_visible (browser->bookmarkbar))
         midori_bookmarkbar_populate (browser);
     else if (katze_item_get_meta_boolean (item, "toolbar"))
-	_action_set_active (browser, "Bookmarkbar", TRUE);
+        _action_set_active (browser, "Bookmarkbar", TRUE);
     midori_browser_update_history (item, "bookmark", "created");
 }
 
@@ -7458,7 +7439,28 @@
 
         browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
         if (!MIDORI_IS_BROWSER (browser))
+        {
+            /* For some reason, when called on the widget of the 
+             * application menubar we get here.
+             */
+
+            GList* top_levels = gtk_window_list_toplevels ();
+            GList *iter;
+
+            for (iter = top_levels; iter; iter = g_list_next (iter)) 
+            {
+                browser = iter->data;
+
+                if (MIDORI_IS_BROWSER (browser) && gtk_widget_is_ancestor( GTK_WIDGET (browser), widget))
+                {
+                    g_list_free (top_levels);
+                    return MIDORI_BROWSER (browser);
+                }
+            }
+            
+            g_list_free (top_levels);
             return NULL;
+        }
     }
 
     return MIDORI_BROWSER (browser);