[Xfce4-commits] <midori:master> Use midori_browser_open_bookmark for the bookmarkbar

[Christian Dywan]

Updating branch refs/heads/master
         to 9c84a2c407aad6147666a86343cc5c0b6db098b1 (commit)
       from a7452bd0b567d284c6dfc03c83a653d77438e829 (commit)

commit 9c84a2c407aad6147666a86343cc5c0b6db098b1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Aug 14 20:58:38 2010 +0200

    Use midori_browser_open_bookmark for the bookmarkbar

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index df83122..495f55c 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -183,6 +183,10 @@ midori_bookmarks_insert_item_db (sqlite3*   db,
                                  KatzeItem* item,
                                  gchar*     folder);
 
+void
+midori_browser_open_bookmark (MidoriBrowser* browser,
+                              KatzeItem*     item);
+
 static void
 midori_bookmarkbar_populate (MidoriBrowser* browser);
 
@@ -2663,7 +2667,7 @@ midori_bookmarkbar_activate_item (GtkAction*     action,
                                   KatzeItem*     item,
                                   MidoriBrowser* browser)
 {
-    midori_browser_set_current_uri (browser, katze_item_get_uri (item));
+    midori_browser_open_bookmark (browser, item);
 }
 
 static gboolean
@@ -3778,14 +3782,8 @@ static void
 midori_browser_bookmark_open_activate_cb (GtkWidget*     menuitem,
                                           MidoriBrowser* browser)
 {
-    KatzeItem* item;
-    const gchar* uri;
-
-    item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    uri = katze_item_get_uri (item);
-
-    if (uri && *uri)
-        midori_browser_set_current_uri (browser, uri);
+    KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
+    midori_browser_open_bookmark (browser, item);
 }
 
 static void