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

[André Auzi]

Show visual feedback when hovering over items in bookmark panel

[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?

[Cris Dywan (kalikiana)]

Thanks a lot for the updates! I think personally it's fine to do the counting this way, as usual I'd like Paweł's opinion on any bookmark UI changes.

Meanwhile "Open as Web A_pplication" was dropped as a pseudo-bookmark feature, please drop it here as well. Generel agreement is to leave this functionality to the web app extension.

There's also a merge conflict, you'll want to 'bzr merge lp:midori' to resolve it (see also the wiki).

Btw you can use "--fixes=lp:1179624" as an argument to "bzr commit" instead of in the message which makes a clickable link in the log and ensures closing of the bug once it's merged.

review: Needs Fixing

[Paweł Forysiuk (tuxator)]

Looks promising.

Please resolve conflicts and drop webapp code, it should slim the patch a bit
making it easier to read.

47 + text = g_strdup_printf(
448 + _("%s : folder, %s and %s"),
449 + name,
450 + child_bookmarks_str,
451 + child_folders_str);

Can you maybe "pack" such statements? I don't think this style is used in midori code and it
balloons the patch as well. I see it a couple of places.

+ text = g_strdup_printf(_("%s : folder, %s and %s"),
+ name, child_bookmarks_str, child_folders_str);

Something like this is still readable i think.

As for translatable strings it would be wise to add comments for translators there
/* i18n: some explanation */ Should help those reading the code as well.
Otherwise code looks good. Let's see again after update.

review: Needs Fixing

[André Auzi (aauzi)]

Thanks for the remarks.

Concerning the "web application" removal it was not clear to me if the status bar text and GTK_STOCK_EXECUTE icon use was to be removed as well. I just left them in the proposal so far.

In my opinion they should stay because it's the only remaining visual hint of the special behaviour of a click on such bookmarks.

Nevertheless it's your design decision, just let me know if I have to cleanup this part as well.

If not, a nice improvement, that's unfortunately not yet in my skills abilities, would be to use a combined icon made of the site's favicon and a "web application marker" (maybe a star or something like that...)

[Cris Dywan (kalikiana)]

André, to clarify. I brought up the app handling because your patch extends it further. The change moving away from it I referred to is https://code.launchpad.net/~kalikiana/midori/dialoglauncher/+merge/166327 . It might be easiest to not modify that handling in this patch and keep it separate instead.

[André Auzi (aauzi)]

Ok I think I've understood.

App handling is going to be something completely different and refering to metadata "app" would produce an integration issue.

I get rid of it.

Thanks for clarifying.

[André Auzi (aauzi)]

comments from:
pfor: displaying title and uri feels kinda redundant to be fair, you see the same information in the panel
pfor: and i guess it depends on the bookmark and your monitor size but sometimes it will obscure the info
pfor: i would just do something like that
pfor: bookmark leading to: ...
pfor: webapp launching: ....
pfor: folder containing: ....
pfor: in statusbar you can have enabled statusbar features that would take some space, with text as such all "critical" info should be still visible
pfor: i would leave the webapp code out for now

[Paweł Forysiuk (tuxator)]

8 + if (KATZE_ITEM_IS_FOLDER (item))
199 + {
200 + gint child_bookmarks_count = midori_array_count_recursive (browser->bookmarks,
201 + "uri <> ''", NULL, item, FALSE);
202 +
203 + if (!child_bookmarks_count)
204 + midori_browser_bookmark_popup_item (menu,
205 + STOCK_TAB_NEW, _("Open all in _Tabs"), item, NULL, browser);
206 + else
207 + midori_browser_bookmark_popup_item (menu,
208 + STOCK_TAB_NEW, _("Open all in _Tabs"),
209 + item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
210 + }

This part looks a bit strange.

review: Needs Fixing

[André Auzi (aauzi)]

> 8 + if (KATZE_ITEM_IS_FOLDER (item))
> 199 + {
> 200 + gint child_bookmarks_count = midori_array_count_recursive
> (browser->bookmarks,
> 201 + "uri <> ''", NULL, item, FALSE);
> 202 +
> 203 + if (!child_bookmarks_count)
> 204 + midori_browser_bookmark_popup_item (menu,
> 205 + STOCK_TAB_NEW, _("Open all in _Tabs"), item, NULL,
> browser);
> 206 + else
> 207 + midori_browser_bookmark_popup_item (menu,
> 208 + STOCK_TAB_NEW, _("Open all in _Tabs"),
> 209 + item,
> midori_browser_bookmark_open_in_tab_activate_cb, browser);
> 210 + }
>
> This part looks a bit strange.

hmm, I guess it's the coding style that looks unfamiliar.

Maybe I could rewrite it this way:

   if (KATZE_ITEM_IS_FOLDER (item))
   {
       gint child_bookmarks_count = midori_array_count_recursive (browser->bookmarks,
           "uri <> ''", NULL, item, FALSE);

       midori_browser_bookmark_popup_item (menu,
           STOCK_TAB_NEW, _("Open all in _Tabs"), item,
           (!child_bookmarks_count ? NULL : midori_browser_bookmark_open_in_tab_activate_cb),
           browser);
    }

The intent is to make the menu item insensitive when the folder does not contain bookmarks as suggested in : http://elementaryos.org/docs/widget-concepts.

It's related to the following change in midori_browser_bookmark_popup_item :
182 - g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata);
183 + if (callback)
184 + g_signal_connect (menuitem, "activate", G_CALLBACK (callback), userdata);
185 + else
186 + gtk_widget_set_sensitive (menuitem, FALSE);

[Paweł Forysiuk (tuxator)]

Works nicely. Code looks good to me.
Thanks for the updates.

Now i kinda miss getting this feedback when hovering over items in bookmarks bar ;)
I think the most of the code could be reused in that case so it should not be hard
to do this after as a subsequent patch maybe.

review: Approve

[André Auzi (aauzi)]

> Works nicely. Code looks good to me.
> Thanks for the updates.
>
> Now i kinda miss getting this feedback when hovering over items in bookmarks
> bar ;)
> I think the most of the code could be reused in that case so it should not be
> hard
> to do this after as a subsequent patch maybe.

Thank you for the quick review and approval.

Concerning the bookmark bar (and bookmark menu btw) they're a totally different story and I didn't feel confident enough with katze-arrayaction's design to change anything around it by the time I started this patch.

Things have changed and their update will probably come ;)

If you want to help me in this process please feel free to comment my other proposals maybe starting by https://code.launchpad.net/~aauzi/midori/fix-1184716 which actually deals about having the same popup context menu shared between the toolbar and menu items.

Beside, I will report the changes made here in the companion bug fixes.

[Cris Dywan (kalikiana)]

278 +midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks)

I would prefer it all text in the statusbar starts uppercase, "Empty folder", "Folder containing" and so on, otherwise it will look poor, spelling has an incredible impact on how you see text

323 + text = g_strdup_printf (_("bookmark leading to : %s"), uri)

No space before : in English

406 +midori_bookmarks_get_item_at_pos (GtkTreeView *treeview,
412 + KatzeItem* item;
420 + if (gtk_tree_model_get_iter (model, &iter, path))
421 + gtk_tree_model_get (model, &iter, 0, &item, -1);

I read an undefined item there if the condition is FALSE.

If you could sort out these last nitpickes I think the patch is good to go

review: Needs Fixing

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

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

Take into account review comments + merge lp:midori

[André Auzi (aauzi)]

> 278 +midori_bookmarks_statusbar_update (MidoriBookmarks *bookmarks)
>
> I would prefer it all text in the statusbar starts uppercase, "Empty folder",
> "Folder containing" and so on, otherwise it will look poor, spelling has an
> incredible impact on how you see text
>
> 323 + text = g_strdup_printf (_("bookmark leading to : %s"),
> uri)
>
> No space before : in English
>
> 406 +midori_bookmarks_get_item_at_pos (GtkTreeView *treeview,
> 412 + KatzeItem* item;
> 420 + if (gtk_tree_model_get_iter (model, &iter, path))
> 421 + gtk_tree_model_get (model, &iter, 0, &item, -1);
>
> I read an undefined item there if the condition is FALSE.
>
> If you could sort out these last nitpickes I think the patch is good to go

No problem. Done.

review: Needs Resubmitting

[Cody Garver (codygarver)]

André, don't mark the branch as Resubmit, that's meant for reviewers to do and it makes the branch less visible on the page that lists available merges. Instead you should only make a regular comment that says you made the requested changes.

[Cris Dywan (kalikiana)]

Please don't merge trunk and fixes in one commit, it makes the diff harder to read (though I knew what I was looking for in this case and it wasn't so bad).

Looks good now!

review: Approve

=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2013-04-16 23:16:24 +0000
+++ midori/midori-array.c	2013-06-04 17:32:25 +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-06-04 17:32:25 +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-31 03:40:27 +0000
+++ midori/midori-browser.c	2013-06-04 17:32:25 +0000
@@ -4147,7 +4147,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);
 }
@@ -4237,10 +4240,16 @@
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
-    if (!katze_item_get_uri (item))
+    if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        gint child_bookmarks_count = midori_array_count_recursive (browser->bookmarks,
+            "uri <> ''", NULL, item, FALSE);
+
         midori_browser_bookmark_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_browser_bookmark_open_in_tab_activate_cb, browser);
+            STOCK_TAB_NEW, _("Open all in _Tabs"), item,
+            (!child_bookmarks_count ? NULL : midori_browser_bookmark_open_in_tab_activate_cb),
+            browser);
+    }
     else
     {
         midori_browser_bookmark_popup_item (menu, GTK_STOCK_OPEN, NULL,
@@ -4252,9 +4261,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 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2013-02-11 21:49:41 +0000
+++ panels/midori-bookmarks.c	2013-06-04 17:32:25 +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,109 @@
     gtk_widget_set_sensitive (GTK_WIDGET (bookmarks->edit), selected);
 }
 
+static gchar* 
+midori_bookmarks_statusbar_bookmarks_str (gint count)
+{
+    if (!count)
+        return NULL;
+
+    /* i18n: [n] bookmark(s) */
+    return g_strdup_printf (ngettext ("%d bookmark", "%d bookmarks", count), count);
+}
+
+static gchar* 
+midori_bookmarks_statusbar_subfolders_str (gint count)
+{
+    if (!count)
+        return NULL;
+
+    /* i18n: [n] subfolder(s) */
+    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;
+
+        g_assert (!KATZE_ITEM_IS_SEPARATOR (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_subfolders_str (child_folders_count);
+            gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+
+            if (!child_bookmarks_count && !child_folders_count)
+                /* i18n: Empty folder */
+                text = g_strdup_printf (_("Empty folder"));
+            else if (!child_bookmarks_count && (child_folders_count >= 1))
+                /* i18n: Folder containing [[n] folder(s)] and no bookmark */
+                text = g_strdup_printf (_("Folder containing %s and no bookmark"),
+                    child_folders_str);
+            else if ((child_bookmarks_count >= 1) && !child_folders_count)
+                /* i18n: Folder containing [[n] bookmark(s)] */
+               text = g_strdup_printf (_("Folder containing %s"), child_bookmarks_str);
+            else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+                /* i18n: Folder containing [[n] bookmark(s)] and [[n] folder(s)] */
+                text = g_strdup_printf (_("Folder containing %s and %s"),
+                    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);
+
+            /* i18n: Bookmark leading to: [bookmark uri] */
+            text = g_strdup_printf (_("Bookmark leading to: %s"), 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_subfolders_str (child_folders_count);
+        gchar* child_bookmarks_str = midori_bookmarks_statusbar_bookmarks_str (child_bookmarks_count);
+        
+        if (!child_bookmarks_count && (child_folders_count >= 1))
+            /* i18n: [[n] folder(s)] and no bookmark */
+            text = g_strdup_printf (_("%s and no bookmark"),
+                child_folders_str);
+        else if ((child_bookmarks_count >= 1) && !child_folders_count)
+            text = g_strdup (child_bookmarks_str);
+        else if ((child_bookmarks_count >= 1) && (child_folders_count >= 1))
+            /* i18n: [[n] bookmark(s)] and [[n] folder(s)] */
+            text = g_strdup_printf (_("%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)
@@ -472,7 +579,7 @@
     if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
     {
         updated = FALSE;
-        g_printerr (_("Failed to update bookmark : %s\n"), errmsg);
+        g_printerr (_("Failed to update bookmark: %s\n"), errmsg);
         sqlite3_free (errmsg);
     }
 
@@ -547,6 +654,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 +853,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);
 }
@@ -831,9 +942,15 @@
 
     menu = gtk_menu_new ();
     if (KATZE_ITEM_IS_FOLDER (item))
+    {
+        gint child_bookmarks_count = midori_array_count_recursive (bookmarks->array,
+            "uri <> ''", NULL, item, FALSE);
+
         midori_bookmarks_popup_item (menu,
-            STOCK_TAB_NEW, _("Open all in _Tabs"),
-            item, midori_bookmarks_open_in_tab_activate_cb, bookmarks);
+            STOCK_TAB_NEW, _("Open all in _Tabs"), item, 
+            (!child_bookmarks_count ? NULL : midori_bookmarks_open_in_tab_activate_cb), 
+            bookmarks);
+    }
     else
     {
         midori_bookmarks_popup_item (menu, GTK_STOCK_OPEN, NULL,
@@ -960,6 +1077,103 @@
     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 = NULL;
+
+    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))
+        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 +1261,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 +1279,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 +1289,6 @@
 
     if (bookmarks->app)
         g_object_unref (bookmarks->app);
+    if (bookmarks->hovering_item)
+	g_object_unref (bookmarks->hovering_item);
 }
-