Merge lp:~evfool/midori/lp1286153 into lp:midori

[Robert Roth]

Fix bookmarkbar bookmark click not opening links

Fix bookmarksbar bookmark click not opening links, most probably because of another recent bugfix [1] for bug #1184716.

The problem was that although the activate-item signal is deprecated, it's still used in katze-arrayaction, and the signal is not handled in midori-browser.

[1] https://code.launchpad.net/~aauzi/midori/fix-1184716/+merge/188200

[frenchy82 (cartes)]

Test ok for me.

review: Approve (testing)

[Cris Dywan (kalikiana)]

How about adding a gboolean return value to midori_browser_open_bookmark?

review: Needs Fixing

[lp:~evfool/midori/lp1286153]

6599. By Robert Roth on 2014-03-23

Return gboolean from midori_browser_open_bookmark (lp:1286153)

[Robert Roth (evfool)]

Branch update as requested (hopefully I understood what you meant).

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-16 22:37:47 +0000
+++ midori/midori-browser.c	2014-03-23 20:37:42 +0000
@@ -165,7 +165,7 @@
                              GValue*     value,
                              GParamSpec* pspec);
 
-void
+gboolean
 midori_browser_open_bookmark (MidoriBrowser* browser,
                               KatzeItem*     item);
 
@@ -3022,6 +3022,14 @@
                                MidoriBrowser*  browser);
 
 static gboolean
+midori_bookmarkbar_activate_item (GtkAction* action,
+                                  KatzeItem* item,
+                                  MidoriBrowser* browser)
+{
+    return midori_browser_open_bookmark (browser, item);;
+}
+
+static gboolean
 midori_bookmarkbar_activate_item_alt (GtkAction*      action,
                                       KatzeItem*      item,
                                       GtkWidget*      proxy,
@@ -3041,7 +3049,7 @@
     }
     else if (event->button == 1)
     {
-        midori_browser_open_bookmark (browser, item);
+        midori_bookmarkbar_activate_item (action, item, browser);
     }
 
     return TRUE;
@@ -3099,7 +3107,7 @@
     return TRUE;
 }
 
-/* static */ void
+/* static */ gboolean
 midori_browser_open_bookmark (MidoriBrowser* browser,
                               KatzeItem*     item)
 {
@@ -3107,7 +3115,7 @@
     gchar* uri_fixed;
 
     if (!(uri && *uri))
-        return;
+        return FALSE;
 
     /* Imported bookmarks may lack a protocol */
     uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
@@ -3122,6 +3130,7 @@
         gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
     }
     g_free (uri_fixed);
+    return TRUE;
 }
 
 static void
@@ -5914,6 +5923,8 @@
                       _action_bookmarks_populate_folder, browser,
                       "signal::activate-item-alt",
                       midori_bookmarkbar_activate_item_alt, browser,
+                      "signal::activate-item",
+                      midori_bookmarkbar_activate_item, browser,
                       NULL);
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);