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

[André Auzi]

[Cris Dywan (kalikiana)]

385 + else if (!child_bookmarks_count && child_folders_count)
386 + text = g_strdup_printf(
387 + _("%s : folder, %d subfolders and no bookmark"),
388 + name, child_folders_count);

This should be done using ngettext, leaving gettext to figure out plural forms (there may be a dual form or other grammatical implications the code can't handle).

Is it necessary to implement midori_array_count_recursive using midori_array_query_recursive rather than asking SQlite to count rows? This seems a bit wasteful.

review: Needs Fixing

[André Auzi (aauzi)]

> 385 + else if (!child_bookmarks_count && child_folders_count)
> 386 + text = g_strdup_printf(
> 387 + _("%s : folder, %d subfolders and no bookmark"),
> 388 + name, child_folders_count);
>
> This should be done using ngettext, leaving gettext to figure out plural forms
> (there may be a dual form or other grammatical implications the code can't
> handle).

Interesting. I was not aware of ngettext existence. I will give it a try.

> Is it necessary to implement midori_array_count_recursive using
> midori_array_query_recursive rather than asking SQlite to count rows? This
> seems a bit wasteful.

Well, the count within a folder is done using a COUNT(*) sql statement but SQLite does not implement recursive queries therefore I had to implement recursion within the code.

I nevertheless agree, midori_array_query_recursive was the easy path and this has to be changed.
Especially if we consider the fact that I not only retrieve the sub folder id but also its *uri* (!!!goof!!!)

This being noticed I still have doubts about the feature, initially I thought we could need to implement fancy stuff like giving the counts for the whole tree depth if the user press the 'alt' or 'ctrl' modifiers but the feedback I get with one child level actually suits my needs, I wonder if the need of such feature would come up one day.

If nobody needs it, it's the whole idea of recursion that's wasteful and we could just get rid of it and stick to one child level count which is achieved with a single SQL statement.

I wonder if it was the meaning of the remark?

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

6171. By André Auzi on 2013-05-30

Take into account review comments

Implements:
 * use of ngettext for plural translations
 * use pure SGLite commands for midori_array_count_recursive_by

6172. By André Auzi on 2013-05-31

Take into account review remarks

6173. By André Auzi on 2013-05-31

Merge with lp:midori.

1 conflict solved:
 * remove of Open link as web application in link popup context menu

6174. By André Auzi on 2013-05-31

Fix potential memory leak in:

489 +static KatzeItem*
490 +midori_bookmarks_get_item_at_pos (GtkTreeView *treeview,
491 + gint x, gint y)
492 +{
493 + GtkTreeModel* model = gtk_tree_view_get_model (treeview);
494 + GtkTreePath* path;
495 + GtkTreeIter iter;
496 + KatzeItem* item;
497 +
498 + gtk_tree_view_get_path_at_pos (treeview, x, y,
499 + &path, NULL, NULL, NULL);
500 +
501 + if (!path)
502 + return NULL;
503 +
504 + if (!gtk_tree_model_get_iter (model, &iter, path))
505 + return NULL;
506 +
507 + gtk_tree_model_get (model, &iter, 0, &item, -1);
508 +
509 + gtk_tree_path_free (path); <= can leak if gtk_tree_model_get_iter returned FALSE
510 +
511 + return item;
512 +}

6175. By André Auzi on 2013-05-31

Complete remove of "app" related code

Take pfor's comments into account: texts simplifications and redundancy
reduced

6176. By André Auzi on 2013-05-31

Merge lp:midori

6177. By André Auzi on 2013-05-31

Remove change in midori_browser_bookmark_open_activate_cb

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

Change code style

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

merge lp:midori

6180. By André Auzi on 2013-06-04

Take into account review comments + merge lp:midori

Unmerged revisions

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2013-02-21 21:36:30 +0000
+++ katze/katze-item.c	2013-05-30 22:02:27 +0000
@@ -445,8 +445,13 @@
 
     g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
 
-    if (widget && KATZE_ITEM_IS_FOLDER (item))
-        return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
+    if (widget)
+    {
+	if (KATZE_ITEM_IS_FOLDER (item))
+	    return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
+	if (KATZE_ITEM_IS_BOOKMARK (item) && katze_item_get_meta_boolean (item, "app"))
+	    return gtk_widget_render_icon (widget, GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU, NULL);
+    }
     if ((pixbuf = midori_paths_get_icon (katze_item_get_icon (item), NULL)))
         return pixbuf;
     if ((pixbuf = midori_paths_get_icon (item->uri, widget)))
@@ -526,7 +531,8 @@
     gtk_widget_show (image);
     if (pixbuf != NULL)
         g_object_unref (pixbuf);
-    if (KATZE_ITEM_IS_FOLDER (item))
+    if (KATZE_ITEM_IS_FOLDER (item) 
+	|| (KATZE_ITEM_IS_BOOKMARK (item) && katze_item_get_meta_boolean (item, "app")))
         return image;
     g_object_set_data (G_OBJECT (image), "KatzeItem", g_object_ref (item));
     g_signal_connect (image, "destroy",
 
=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2013-04-16 23:16:24 +0000
+++ midori/midori-array.c	2013-05-30 22:02:27 +0000
@@ -1194,3 +1194,153 @@
     return midori_array_query_recursive (bookmarks, fields, condition, value, FALSE);
 }
 
+static gint64
+count_from_sqlite (sqlite3*     db,
+		   const gchar* sqlcmd)
+{
+    gint64 count = -1;
+    sqlite3_stmt* stmt;
+    gint result;
+    
+    result = sqlite3_prepare_v2 (db, sqlcmd, -1, &stmt, NULL);
+    if (result != SQLITE_OK)
+        return -1;
+
+    g_assert (sqlite3_column_count (stmt) == 1);
+    
+    if ((result = sqlite3_step (stmt)) == SQLITE_ROW)
+	count = sqlite3_column_int64(stmt, 0);
+
+    sqlite3_clear_bindings (stmt);
+    sqlite3_reset (stmt);
+
+    return count;
+}
+
+static gint64
+midori_array_count_recursive_by_id (KatzeArray*  bookmarks,
+				    const gchar* condition,
+				    const gchar* value,
+				    gint64       id,
+				    gboolean     recursive)
+{
+    gint64 count = -1;
+    sqlite3* db;
+    gchar* sqlcmd;
+    char* sqlcmd_value;
+    sqlite3_stmt* stmt;
+    gint result;
+    GList* ids;
+    GList* iter_ids;
+
+    g_return_val_if_fail (condition, -1);
+    g_return_val_if_fail (KATZE_IS_ARRAY (bookmarks), -1);
+    db = g_object_get_data (G_OBJECT (bookmarks), "db");
+    g_return_val_if_fail (db != NULL, -1);
+
+    g_assert(!strstr("parentid", condition));
+
+    if (id > 0)
+	sqlcmd = g_strdup_printf ("SELECT COUNT(*) FROM bookmarks "
+				  "WHERE parentid = %" G_GINT64_FORMAT " AND %s",
+				  id,
+				  condition);
+    else
+	sqlcmd = g_strdup_printf ("SELECT COUNT(*) FROM bookmarks "
+				  "WHERE parentid IS NULL AND %s ",
+				  condition);
+
+    if (strstr (condition, "%q"))
+    {
+        sqlcmd_value = sqlite3_mprintf (sqlcmd, value ? value : "");
+        count = count_from_sqlite (db, sqlcmd_value);
+        sqlite3_free (sqlcmd_value);
+    }
+    else
+        count = count_from_sqlite (db, sqlcmd);
+
+    g_free (sqlcmd);
+
+    if (!recursive || (count < 0))
+        return count;
+
+    ids = NULL;
+
+    if (id > 0)
+	sqlcmd_value = sqlite3_mprintf (
+	    "SELECT id FROM bookmarks "
+	    "WHERE parentid = %" G_GINT64_FORMAT " AND uri = ''", id);
+    else
+	sqlcmd_value = sqlite3_mprintf (
+	    "SELECT id FROM bookmarks "
+	    "WHERE parentid IS NULL AND uri = ''");
+
+    if (sqlite3_prepare_v2 (db, sqlcmd_value, -1, &stmt, NULL) == SQLITE_OK)
+    {
+	g_assert (sqlite3_column_count (stmt) == 1);
+    
+	if ((result = sqlite3_step (stmt)) == SQLITE_ROW)
+	{
+	    gint64* pid = g_new (gint64, 1);
+	    
+	    *pid = sqlite3_column_int64(stmt, 0);
+	    ids = g_list_append (ids, pid);
+	}
+	
+	sqlite3_clear_bindings (stmt);
+	sqlite3_reset (stmt);
+    }
+
+    sqlite3_free (sqlcmd_value);
+
+    iter_ids = ids;
+    while (iter_ids)
+    {
+	gint64 sub_count = midori_array_count_recursive_by_id (bookmarks,
+							       condition,
+							       value,
+							       *(gint64*)(iter_ids->data),
+							       recursive);
+	
+	if (sub_count < 0)
+	{
+	    g_list_free_full (ids, g_free);
+	    return -1;
+	}
+	
+	count += sub_count;
+	iter_ids = g_list_next (iter_ids);
+    }
+	
+    g_list_free_full (ids, g_free);
+    return count;
+}
+
+/**
+ * midori_array_count_recursive:
+ * @array: the main bookmark array
+ * @condition: condition, like "folder = '%q'"
+ * @value: a value to be inserted if @condition contains %q
+ * @recursive: if %TRUE include children
+ *
+ * Return value: the number of elements on success, -1 otherwise
+ *
+ * Since: 0.5.2
+ **/
+gint64
+midori_array_count_recursive (KatzeArray*  bookmarks,
+			      const gchar* condition,
+                              const gchar* value,
+			      KatzeItem*   folder,
+                              gboolean     recursive)
+{
+    gint64 id = -1;
+
+    g_return_val_if_fail (!folder || KATZE_ITEM_IS_FOLDER (folder), -1);
+    
+    id = folder ? katze_item_get_meta_integer (folder, "id") : 0;
+
+    return midori_array_count_recursive_by_id (bookmarks, condition,
+					       value, id,
+					       recursive);
+}
 
=== modified file 'midori/midori-array.h'
--- midori/midori-array.h	2012-01-03 20:15:19 +0000
+++ midori/midori-array.h	2013-05-30 22:02:27 +0000
@@ -47,4 +47,11 @@
 katze_array_from_sqlite (sqlite3*     db,
                          const gchar* sqlcmd);
 
+gint64
+midori_array_count_recursive (KatzeArray*  bookmarks,
+			      const gchar* condition,
+                              const gchar* value,
+			      KatzeItem*   folder,
+                              gboolean     recursive);
+
 #endif /* !__MIDORI_ARRAY_H__ */
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-05-28 20:02:29 +0000
+++ midori/midori-browser.c	2013-05-30 22:02:27 +0000
@@ -4132,7 +4132,10 @@
     else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata);
+    if (callback)
+        g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata);
+    else
+        gtk_widget_set_sensitive (menuitem, FALSE);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);
 }
@@ -4141,8 +4144,43 @@
 midori_browser_bookmark_open_activate_cb (GtkWidget*     menuitem,
                                           MidoriBrowser* browser)
 {
-    KatzeItem* item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
-    midori_browser_open_bookmark (browser, item);
+    KatzeItem* item;
+    const gchar* uri;
+
+    item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
+
+    if ((uri = katze_item_get_uri (item)) && *uri)
+    {
+        gchar* uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
+        if (!uri_fixed)
+            uri_fixed = g_strdup (uri);
+   
+        midori_browser_set_current_uri (browser, uri_fixed);
+        gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
+
+        g_free (uri_fixed);
+    }
+}
+
+static void
+midori_browser_bookmark_run_web_application_cb (GtkWidget*     menuitem,
+                                                MidoriBrowser* browser)
+{
+    KatzeItem* item;
+    const gchar* uri;
+
+    item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
+
+    if ((uri = katze_item_get_uri (item)) && *uri)
+    {
+        gchar* uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
+        if (!uri_fixed)
+            uri_fixed = g_strdup (uri);
+   
+        sokoke_spawn_app (uri_fixed, FALSE);
+
+        g_free (uri_fixed);
+    }
 }
 
 static void
@@ -4222,14 +4260,43 @@
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
-    if (!katze_item_get_uri (item))
-        midori_browser_bookmark_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
+    if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        gint child_bookmarks_count = midori_array_count_recursive(
+            browser->bookmarks,
+            "uri <> ''",
+            NULL,
+            item,
+            FALSE);
+
+        if (!child_bookmarks_count) 
+            midori_browser_bookmark_popup_item (
+                menu,
+                STOCK_TAB_NEW, _("Open all in _Tabs"),
+                item, NULL, browser);
+        else
+            midori_browser_bookmark_popup_item (
+                menu,
+                STOCK_TAB_NEW, _("Open all in _Tabs"),
+                item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
+    }
     else
     {
-        midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
-            item, midori_browser_bookmark_open_activate_cb, browser);
+        if (katze_item_get_meta_boolean (item, "app"))
+        {
+            midori_browser_bookmark_popup_item (menu, GTK_STOCK_EXECUTE, _("Open as Web A_pplication"),
+                                                item, midori_browser_bookmark_run_web_application_cb, browser);
+            midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
+                                                item, midori_browser_bookmark_open_activate_cb, browser);
+        }
+        else
+        {
+            midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
+                                                item, midori_browser_bookmark_open_activate_cb, browser);
+            midori_browser_bookmark_popup_item (menu, GTK_STOCK_EXECUTE, _("Open as Web A_pplication"),
+                                                item, midori_browser_bookmark_run_web_application_cb, browser);
+        }
+
         midori_browser_bookmark_popup_item (menu,
             STOCK_TAB_NEW, _("Open in New _Tab"),
             item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
@@ -4237,9 +4304,11 @@
             STOCK_WINDOW_NEW, _("Open in New _Window"),
             item, midori_browser_bookmark_open_in_window_activate_cb, browser);
     }
+
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);
+
     midori_browser_bookmark_popup_item (menu, GTK_STOCK_EDIT, NULL,
         item, midori_browser_bookmark_edit_activate_cb, widget);
     midori_browser_bookmark_popup_item (menu, GTK_STOCK_DELETE, NULL,
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-05-30 16:40:15 +0000
+++ midori/midori-view.c	2013-05-30 22:02:27 +0000
@@ -2747,6 +2747,12 @@
         midori_view_insert_menu_item (menu_shell, -1,
             _("Open Link in New _Window"), STOCK_WINDOW_NEW,
             G_CALLBACK (midori_web_view_menu_new_window_activate_cb), widget);
+<<<<<<< TREE
+=======
+        midori_view_insert_menu_item (menu_shell, -1,
+            _("Open Link as Web A_pplication"), GTK_STOCK_EXECUTE,
+            G_CALLBACK (midori_web_view_menu_web_app_activate_cb), widget);
+>>>>>>> MERGE-SOURCE
         }
 
         midori_view_insert_menu_item (menu_shell, -1,
 
=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2013-02-11 21:49:41 +0000
+++ panels/midori-bookmarks.c	2013-05-30 22:02:27 +0000
@@ -39,7 +39,6 @@
 struct _MidoriBookmarks
 {
     GtkVBox parent_instance;
-
     GtkWidget* toolbar;
     GtkWidget* edit;
     GtkWidget* delete;
@@ -49,6 +48,8 @@
 
     gint filter_timeout;
     gchar* filter;
+
+    KatzeItem* hovering_item;
 };
 
 struct _MidoriBookmarksClass
@@ -86,6 +87,9 @@
                                GParamSpec* pspec);
 
 static void
+midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks);
+
+static void
 midori_bookmarks_class_init (MidoriBookmarksClass* class)
 {
     GObjectClass* gobject_class;
@@ -441,6 +445,140 @@
     gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->edit), selected);
 }
 
+static gchar* 
+midori_bookmarks_statusbar_bookmarks_str (gint count)
+{
+    if (!count)
+	return NULL;
+
+    return g_strdup_printf (ngettext ("%d bookmark", "%d bookmarks", count), count);
+}
+
+static gchar* 
+midori_bookmarks_statusbar_subfolder_str (gint count)
+{
+    if (!count)
+	return NULL;
+
+    return g_strdup_printf (ngettext ("%d subfolder", "%d subfolders", count), count);
+}
+
+static void
+midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks)
+{
+    gchar* text = NULL;
+    GtkTreeModel* model;
+    GtkTreeIter   iter;
+    gboolean selected;
+
+    if (bookmarks->hovering_item)
+    {
+        KatzeItem* item = bookmarks->hovering_item;
+        const gchar* name;
+
+        g_assert (!KATZE_ITEM_IS_SEPARATOR (item));
+
+        name = katze_item_get_name (item);
+
+        if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            gint child_folders_count = midori_array_count_recursive (
+		bookmarks->array,
+		"uri = ''",
+		NULL,
+		item,
+		FALSE);
+            gint child_bookmarks_count = midori_array_count_recursive (
+		bookmarks->array,
+		"uri <> ''",
+		NULL,
+		item,
+		FALSE);
+	    gchar* child_folders_str = midori_bookmarks_statusbar_subfolder_str (child_folders_count);
+	    gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+
+            if (!child_bookmarks_count && !child_folders_count)
+                text = g_strdup_printf(
+                    _("%s : empty folder"),
+                    name);
+            else if (!child_bookmarks_count && (child_folders_count >= 1))
+                text = g_strdup_printf(
+		    _("%s : folder, %s and no bookmark"),
+                    name,
+		    child_folders_str);
+            else if ((child_bookmarks_count >= 1) && !child_folders_count)
+                text = g_strdup_printf(
+                    _("%s : folder, %s"),
+                    name,
+		    child_bookmarks_str);
+            else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+                text = g_strdup_printf(
+                    _("%s : folder, %s and %s"),
+                    name,
+		    child_bookmarks_str,
+		    child_folders_str);
+
+	    g_free (child_folders_str);
+	    g_free (child_bookmarks_str);
+        }
+        else if (KATZE_ITEM_IS_BOOKMARK (item))
+        {
+            const gchar* uri = katze_item_get_uri (item);
+
+	    if (katze_item_get_meta_boolean (item, "app"))
+		text = g_strdup_printf (_("%s : web application bookmark to : %s"), name, uri);
+	    else
+		text = g_strdup_printf (_("%s : bookmark to : %s"), name, uri);
+        }
+    }
+    else
+    {
+	gint child_folders_count = midori_array_count_recursive (
+	    bookmarks->array,
+	    "uri = ''",
+	    NULL,
+	    NULL,
+	    FALSE);
+	gint child_bookmarks_count = midori_array_count_recursive (
+	    bookmarks->array,
+	    "uri <> ''",
+	    NULL,
+	    NULL,
+	    FALSE);
+	gchar* child_folders_str = midori_bookmarks_statusbar_subfolder_str (child_folders_count);
+	gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+	
+	if (!child_bookmarks_count && !child_folders_count)
+	    text = g_strdup_printf(
+		_("Bookmarks : empty"));
+	else if (!child_bookmarks_count && (child_folders_count >= 1))
+	    text = g_strdup_printf(
+		_("Bookmarks : %s and no bookmark"),
+		child_folders_str);
+	else if ((child_bookmarks_count >= 1) && !child_folders_count)
+	    text = g_strdup_printf(
+		_("Bookmarks : %s"),
+		child_bookmarks_str);
+	else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+	    text = g_strdup_printf(
+		_("Bookmarks : %s and %s"),
+		child_bookmarks_str,
+		child_folders_str);
+	
+	g_free (child_folders_str);
+	g_free (child_bookmarks_str);
+    }
+
+    if (text)
+    {
+        MidoriBrowser* browser = midori_browser_get_for_widget (bookmarks->treeview);
+        
+        g_object_set (browser, "statusbar-text", text, NULL);
+        
+        g_free(text);
+    }
+}
+
 gboolean
 midori_bookmarks_update_item_db (sqlite3*   db,
                                  KatzeItem* item)
@@ -547,6 +685,7 @@
         gtk_widget_show (GTK_WIDGET (toolitem));
         bookmarks->delete = GTK_WIDGET (toolitem);
         midori_bookmarks_toolbar_update (bookmarks);
+        midori_bookmarks_statusbar_update (bookmarks);
         toolitem = gtk_separator_tool_item_new ();
         gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (toolitem), FALSE);
         gtk_tool_item_set_expand (toolitem, TRUE);
@@ -745,7 +884,10 @@
     else if (!KATZE_ITEM_IS_FOLDER (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
-    g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks);
+    if (callback)
+	g_signal_connect (menuitem, "activate", G_CALLBACK (callback), bookmarks);
+    else
+	gtk_widget_set_sensitive (menuitem, FALSE);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);
 }
@@ -767,6 +909,27 @@
 }
 
 static void
+midori_bookmarks_run_web_application_cb (GtkWidget*       menuitem,
+					 MidoriBookmarks* bookmarks)
+{
+    KatzeItem* item;
+    const gchar* uri;
+
+    item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
+
+    if ((uri = katze_item_get_uri (item)) && *uri)
+    {
+	gchar* uri_fixed = sokoke_magic_uri (uri, TRUE, FALSE);
+	if (!uri_fixed)
+	    uri_fixed = g_strdup (uri);
+   
+        sokoke_spawn_app (uri_fixed, FALSE);
+
+        g_free (uri_fixed);
+    }
+}
+
+static void
 midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
                                           MidoriBookmarks* bookmarks)
 {
@@ -831,21 +994,52 @@
 
     menu = gtk_menu_new ();
     if (KATZE_ITEM_IS_FOLDER (item))
-        midori_bookmarks_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
+    {
+	gint child_bookmarks_count = midori_array_count_recursive(
+	    bookmarks->array,
+	    "uri <> ''",
+	    NULL,
+	    item,
+	    FALSE);
+
+	if (!child_bookmarks_count) 
+	    midori_bookmarks_popup_item (menu,
+					 STOCK_TAB_NEW, _("Open all in _Tabs"),
+					 item, NULL, bookmarks);
+	else
+	    midori_bookmarks_popup_item (menu,
+					 STOCK_TAB_NEW, _("Open all in _Tabs"),
+					 item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
+    }
     else
     {
-        midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
-            item, midori_bookmarks_open_activate_cb, bookmarks);
+	if (katze_item_get_meta_boolean (item, "app"))
+	{
+	    midori_bookmarks_popup_item (menu, 
+					 GTK_STOCK_EXECUTE, _("Open as Web A_pplication"),
+					 item, midori_bookmarks_run_web_application_cb, bookmarks);
+	    midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
+					 item, midori_bookmarks_open_activate_cb, bookmarks);
+	}
+	else
+	{
+	    midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
+					 item, midori_bookmarks_open_activate_cb, bookmarks);
+	    midori_bookmarks_popup_item (menu,
+					 GTK_STOCK_EXECUTE, _("Open as Web A_pplication"),
+					 item, midori_bookmarks_run_web_application_cb, bookmarks);
+	}
+
         midori_bookmarks_popup_item (menu, STOCK_TAB_NEW, _("Open in New _Tab"),
             item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
         midori_bookmarks_popup_item (menu, STOCK_WINDOW_NEW, _("Open in New _Window"),
             item, midori_bookmarks_open_in_window_activate_cb, bookmarks);
     }
+
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
     gtk_widget_show (menuitem);
+
     midori_bookmarks_popup_item (menu, GTK_STOCK_EDIT, NULL,
         item, midori_bookmarks_edit_clicked_cb, bookmarks);
     midori_bookmarks_popup_item (menu, GTK_STOCK_DELETE, NULL,
@@ -960,6 +1154,105 @@
     midori_bookmarks_toolbar_update (bookmarks);
 }
 
+static KatzeItem*
+midori_bookmarks_get_item_at_pos (GtkTreeView *treeview,
+				  gint x, gint y)
+{    
+    GtkTreeModel* model = gtk_tree_view_get_model (treeview);
+    GtkTreePath* path;
+    GtkTreeIter iter;
+    KatzeItem* item;
+
+    gtk_tree_view_get_path_at_pos (treeview, x, y,
+				   &path, NULL, NULL, NULL);
+    
+    if (!path)
+	return NULL;
+    
+    if (!gtk_tree_model_get_iter (model, &iter, path))
+	return NULL;
+    
+    gtk_tree_model_get (model, &iter, 0, &item, -1);
+    
+    gtk_tree_path_free (path);
+
+    return item;
+}
+
+static gboolean
+midori_bookmarks_enter_notify_event_cb (GtkTreeView      *treeview,
+					GdkEventCrossing *event,
+					MidoriBookmarks  *bookmarks)
+{
+    KatzeItem* item = midori_bookmarks_get_item_at_pos (treeview, event->x, event->y);
+
+    if (bookmarks->hovering_item)
+	g_object_unref (bookmarks->hovering_item);
+
+    bookmarks->hovering_item = item;
+
+    midori_bookmarks_statusbar_update (bookmarks);
+
+    return FALSE;
+}
+
+static gboolean
+midori_bookmarks_motion_notify_event_cb (GtkTreeView     *treeview,
+					 GdkEventMotion  *event,
+					 MidoriBookmarks *bookmarks)
+{
+    gboolean item_changed;
+    KatzeItem* item;
+    gint x;
+    gint y;
+
+    if (event->is_hint)
+	gtk_widget_get_pointer (GTK_WIDGET (treeview), &x, &y);
+    else
+    {
+	x = event->x;
+	y = event->y;
+    }
+
+    item = midori_bookmarks_get_item_at_pos (treeview, x, y);
+
+    item_changed = (bookmarks->hovering_item != item) ? TRUE : FALSE;
+
+    if (!item_changed)
+    {
+	if (item)
+	    g_object_unref (item);
+    }
+    else
+    {
+	if (bookmarks->hovering_item)
+	    g_object_unref (bookmarks->hovering_item);
+
+	bookmarks->hovering_item = item;
+
+	midori_bookmarks_statusbar_update (bookmarks);
+    }
+
+    return FALSE;
+}
+
+static gboolean
+midori_bookmarks_leave_notify_event_cb (GtkTreeView      *treeview,
+					GdkEventCrossing *event,
+					MidoriBookmarks  *bookmarks)
+{
+    MidoriBrowser* browser = midori_browser_get_for_widget (bookmarks->treeview);
+
+    if (bookmarks->hovering_item)
+	g_object_unref (bookmarks->hovering_item);
+    
+    bookmarks->hovering_item = NULL;
+
+    g_object_set (browser, "statusbar-text", "", NULL);
+
+    return FALSE;
+}
+
 static gboolean
 midori_bookmarks_filter_timeout_cb (gpointer data)
 {
@@ -1047,7 +1340,17 @@
                       midori_bookmarks_row_expanded_cb, bookmarks,
                       "signal::row-collapsed",
                       midori_bookmarks_row_collapsed_cb, bookmarks,
+                      "signal::enter-notify-event",
+                      midori_bookmarks_enter_notify_event_cb, bookmarks,
+                      "signal::motion-notify-event",
+                      midori_bookmarks_motion_notify_event_cb, bookmarks,
+                      "signal::leave-notify-event",
+                      midori_bookmarks_leave_notify_event_cb, bookmarks,
                       NULL);
+    gtk_widget_add_events (GTK_WIDGET (treeview), 
+			   GDK_POINTER_MOTION_MASK
+			   | GDK_POINTER_MOTION_HINT_MASK);
+
     selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (midori_bookmarks_selection_changed_cb),
@@ -1055,6 +1358,7 @@
     gtk_widget_show (treeview);
     gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0);
     bookmarks->treeview = treeview;
+    bookmarks->hovering_item = NULL;
 }
 
 static void
@@ -1064,5 +1368,6 @@
 
     if (bookmarks->app)
         g_object_unref (bookmarks->app);
+    if (bookmarks->hovering_item)
+	g_object_unref (bookmarks->hovering_item);
 }
-