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

[André Auzi]

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

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

6178. By André Auzi on 2013-06-25

merge lp:midori

6179. By André Auzi on 2013-06-25

merge lp:midori

6180. By André Auzi on 2013-07-11

fix most anoying weird menu behaviors when activating the context popup

6181. By André Auzi on 2013-07-11

merge lp:midori

6182. By André Auzi on 2013-07-30

merge lp:midori

6183. By André Auzi on 2013-09-28

merge lp:midori

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

Unmerged revisions

=== modified file 'katze/katze-arrayaction.c'
--- katze/katze-arrayaction.c	2012-12-16 18:40:00 +0000
+++ katze/katze-arrayaction.c	2013-09-28 15:27:18 +0000
@@ -52,6 +52,7 @@
     POPULATE_FOLDER,
     ACTIVATE_ITEM,
     ACTIVATE_ITEM_ALT,
+    ACTIVATE_ITEM_FULL,
     LAST_SIGNAL
 };
 
@@ -167,7 +168,7 @@
      * Return value: %TRUE if the event was handled. If %FALSE is returned,
      *               the default "activate-item" signal is emitted.
      *
-     * Since: 0.1.7
+     * Deprecated: 0.5.2: Use "activate-item-full" instead.
      **/
     signals[ACTIVATE_ITEM_ALT] = g_signal_new ("activate-item-alt",
                                        G_TYPE_FROM_CLASS (class),
@@ -179,6 +180,34 @@
                                        G_TYPE_BOOLEAN, 2,
                                        KATZE_TYPE_ITEM, G_TYPE_UINT);
 
+    /**
+     * KatzeArrayAction::activate-item-full:
+     * @array: the object on which the signal is emitted
+     * @item: the item being activated
+     * @event: the %GdkButtonEvent pressed
+     * @proxy: the %GtkWidget that caught the 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-alt" signal is emitted. If
+     *               "activate-item-alt" is not handled on its turn, the
+     *               "activate-item" signal is finally emitted.
+     *
+     * Since: 0.5.2
+     **/
+    signals[ACTIVATE_ITEM_FULL] = g_signal_new ("activate-item-full",
+                                       G_TYPE_FROM_CLASS (class),
+                                       (GSignalFlags) (G_SIGNAL_RUN_LAST),
+                                       0,
+                                       0,
+                                       NULL,
+                                       midori_cclosure_marshal_BOOLEAN__OBJECT_POINTER_OBJECT,
+                                       G_TYPE_BOOLEAN, 3,
+				                       KATZE_TYPE_ITEM,
+				                       GDK_TYPE_EVENT,
+				                       GTK_TYPE_WIDGET);
+
     gobject_class = G_OBJECT_CLASS (class);
     gobject_class->finalize = katze_array_action_finalize;
     gobject_class->set_property = katze_array_action_set_property;
@@ -285,16 +314,76 @@
         GTK_ACTION_CLASS (katze_array_action_parent_class)->activate (action);
 }
 
-static void
+static gboolean
 katze_array_action_activate_item (KatzeArrayAction* action,
                                   KatzeItem*        item,
-                                  gint              button)
+                                  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.
+     * We need to check if the current event is usable.
+     * If it's not we just synthetize a usable button event.
+     */
+
+    gboolean free_event = FALSE;
     gboolean handled = FALSE;
-    g_signal_emit (action, signals[ACTIVATE_ITEM_ALT], 0, item,
-                   button, &handled);
+
+    if (!event)
+    {
+        event = (GdkEventButton*)gtk_get_current_event ();
+        if (event->type != GDK_BUTTON_PRESS)
+        {
+            gdk_event_free ((GdkEvent*)event);
+            event = NULL;
+        }
+        else
+            free_event = TRUE;
+    }
+
+    if (!event)
+    {            /* Simulate a button 1 press event */
+        gint x;
+        gint y;
+        gint x_root;
+        gint y_root;
+
+        free_event = TRUE;
+        event = (GdkEventButton*)gdk_event_new (GDK_BUTTON_PRESS);
+        event->type = GDK_BUTTON_PRESS;
+        event->window = proxy->window;
+        event->send_event = FALSE;
+        event->time = gtk_get_current_event_time();
+        gdk_window_get_pointer (proxy->window,
+            &x, &y,
+            NULL);
+        event->x = x;
+        event->y = y;
+        gtk_get_current_event_state (&event->state);
+
+        event->button = 1;
+        event->device = NULL; /* FIXME: find the mouse device */
+        gdk_window_get_root_coords (proxy->window,
+            x, y,
+            &x_root,
+            &y_root);
+        event->x_root = x_root;
+        event->y_root = y_root;
+    }
+
+    g_signal_emit (action, signals[ACTIVATE_ITEM_FULL], 0, item,
+        event, proxy, &handled);
+    if (!handled)
+        g_signal_emit (action, signals[ACTIVATE_ITEM_ALT], 0, item,
+            event->button, &handled);
     if (!handled)
         g_signal_emit (action, signals[ACTIVATE_ITEM], 0, item);
+
+    if (free_event)
+        gdk_event_free ((GdkEvent*)event);
+
+    return handled;
 }
 
 static void
@@ -302,7 +391,46 @@
                                       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, NULL, proxy);
+}
+
+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 (array_action, item, event, proxy);
+}
+
+static gboolean
+pointer_in_menu_window (GtkWidget *widget,
+                        gdouble    x_root,
+                        gdouble    y_root)
+{
+    GtkMenu *menu = GTK_MENU (widget);
+
+    if (gtk_widget_get_mapped (menu->toplevel))
+    {
+        GtkMenuShell *menu_shell;
+        gint          window_x, window_y;
+
+        gdk_window_get_position (menu->toplevel->window, &window_x, &window_y);
+
+        if (x_root >= window_x && x_root < window_x + widget->allocation.width &&
+            y_root >= window_y && y_root < window_y + widget->allocation.height)
+            return TRUE;
+
+        menu_shell = GTK_MENU_SHELL (widget);
+
+        if (GTK_IS_MENU (menu_shell->parent_menu_shell))
+            return pointer_in_menu_window (menu_shell->parent_menu_shell,
+                x_root, y_root);
+    }
+
+    return FALSE;
 }
 
 static gboolean
@@ -310,22 +438,74 @@
                                          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
+    */
+
+    if (GTK_IS_MENU_SHELL (gtk_get_event_widget ((GdkEvent *) event)) &&
+        pointer_in_menu_window (proxy, event->x_root, event->y_root))
+        return FALSE;
+
+    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 = proxy->parent;
+    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 (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 +535,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 +566,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 +606,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 +638,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 +655,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), NULL, proxy);
         return;
     }
 
@@ -512,7 +675,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 +769,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 +847,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 +930,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-09-28 15:27:18 +0000
@@ -1,6 +1,7 @@
 BOOLEAN:OBJECT
 BOOLEAN:OBJECT,OBJECT
 BOOLEAN:OBJECT,UINT
+BOOLEAN:OBJECT,POINTER,OBJECT
 BOOLEAN:VOID
 BOOLEAN:STRING
 OBJECT:OBJECT

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-09-17 19:34:23 +0000
+++ midori/midori-browser.c	2013-09-28 15:27:18 +0000
@@ -3124,18 +3124,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_full (GtkAction*      action,
+                                       KatzeItem*      item,
+                                       GdkEventButton* event,
+                                       GtkWidget*      proxy,
+                                       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);
     }
@@ -3240,12 +3253,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,
@@ -4373,6 +4380,9 @@
        it is an item, we forward it to the actual widget. */
     if ((GTK_IS_BOX (toolitem) || GTK_IS_MENU_BAR (toolitem)))
     {
+	if (toolitem->window != 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,
@@ -6202,8 +6212,8 @@
     g_object_connect (action,
                       "signal::populate-folder",
                       _action_bookmarks_populate_folder, browser,
-                      "signal::activate-item-alt",
-                      midori_bookmarkbar_activate_item_alt, browser,
+                      "signal::activate-item-full",
+                      midori_bookmarkbar_activate_item_full, browser,
                       NULL);
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);
@@ -6220,8 +6230,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);
@@ -6989,29 +6997,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)
@@ -7022,15 +7007,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));
@@ -7899,7 +7876,28 @@
 
         browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
         if (!MIDORI_IS_BROWSER (browser))
-            return NULL;
+	{
+	    /* For some reason, when called on the wiget 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))
+		{
+		    g_list_free (top_levels);
+		    return MIDORI_BROWSER (browser);
+		}
+	    }
+	    
+	    g_list_free (top_levels);
+	    return NULL;
+	}
     }
 
     return MIDORI_BROWSER (browser);