Merge lp:~aauzi/midori/fix-1179200-3 into lp:midori

[André Auzi]

Allow bookmark bar update on additions resulting from imports

Third step for merge of fix-1179200

Here, the bookmark bar is updated by callback after katze_array_add_item.
Import is reworked a step further to use katze_array_add_item instead of direct db insert

Note: there's no need to restart midori to see imported bookmarks in the bookmark bar.

[Cris Dywan (kalikiana)]

I might like to see the idle kept out of the browser itself, but the approach is good and I like moving away from directly working with the db.

review: Approve

=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2013-05-30 21:57:04 +0000
+++ midori/midori-array.c	2013-08-05 09:36:27 +0000
@@ -97,15 +97,15 @@
         if (katze_str_equal ((gchar*)cur->name, "title"))
         {
             gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
+            katze_item_set_name (KATZE_ITEM (array), value);
+            xmlFree (value);
+        }
+        else if (katze_str_equal ((gchar*)cur->name, "desc"))
+        {
+            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
             katze_item_set_text (KATZE_ITEM (array), value);
             xmlFree (value);
         }
-        else if (katze_str_equal ((gchar*)cur->name, "desc"))
-        {
-            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
-            katze_item_set_name (KATZE_ITEM (array), value);
-            xmlFree (value);
-        }
         else if (katze_str_equal ((gchar*)cur->name, "info"))
             katze_xbel_parse_info ((KatzeItem*)array, cur);
         else if (katze_str_equal ((gchar*)cur->name, "folder"))
@@ -1069,6 +1069,17 @@
         item = katze_item_new ();
         for (i = 0; i < cols; i++)
             katze_item_set_value_from_column (stmt, i, item);
+
+        if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            g_object_unref (item);
+
+            item = KATZE_ITEM (katze_array_new (KATZE_TYPE_ITEM));
+
+            for (i = 0; i < cols; i++)
+                katze_item_set_value_from_column (stmt, i, item);
+        }
+
         katze_array_add_item (array, item);
     }
 
@@ -1157,12 +1168,18 @@
         if (KATZE_ITEM_IS_FOLDER (item))
         {
             gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT,
-                katze_item_get_meta_integer (item, "id"));
+					       katze_item_get_meta_integer (item, "id"));
             KatzeArray* subarray = midori_array_query_recursive (bookmarks,
-                fields, "parentid=%q", parentid, TRUE);
-            katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item));
-            katze_array_add_item (array, subarray);
-
+								 fields, "parentid=%q", parentid, TRUE);
+            KatzeItem* subitem;
+            GList* sublist;
+
+            KATZE_ARRAY_FOREACH_ITEM_L (subitem, subarray, sublist)
+            {
+                katze_array_add_item (KATZE_ARRAY (item), subitem);
+            }
+
+            g_object_unref (subarray);
             g_free (parentid);
         }
     }

=== modified file 'midori/midori-bookmarks.c'
--- midori/midori-bookmarks.c	2013-07-03 19:42:45 +0000
+++ midori/midori-bookmarks.c	2013-08-05 09:36:27 +0000
@@ -310,24 +310,6 @@
 }
 
 void
-midori_bookmarks_import (const gchar* filename,
-                         sqlite3*     db)
-{
-    KatzeArray* bookmarks;
-    GError* error = NULL;
-
-    bookmarks = katze_array_new (KATZE_TYPE_ARRAY);
-
-    if (!midori_array_from_file (bookmarks, filename, "xbel", &error))
-    {
-        g_warning (_("The bookmarks couldn't be saved. %s"), error->message);
-        g_error_free (error);
-        return;
-    }
-    midori_bookmarks_import_array_db (db, bookmarks, 0);
-}
-
-void
 midori_bookmarks_on_quit (KatzeArray* array)
 {
     g_return_if_fail (KATZE_IS_ARRAY (array));

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-02 12:00:42 +0000
+++ midori/midori-browser.c	2013-08-05 09:36:27 +0000
@@ -97,6 +97,8 @@
     gboolean show_statusbar;
     guint maximum_history_age;
     guint last_web_search;
+
+    gboolean bookmarkbar_populate;
 };
 
 G_DEFINE_TYPE (MidoriBrowser, midori_browser, GTK_TYPE_WINDOW)
@@ -163,9 +165,9 @@
                              GParamSpec* pspec);
 
 void
-midori_bookmarks_import_array_db (sqlite3*    db,
-                                  KatzeArray* array,
-                                  gint64      parentid);
+midori_bookmarks_import_array (KatzeArray*    bookmarks,
+                               KatzeArray* array,
+                               gint64      parentid);
 
 gboolean
 midori_bookmarks_update_item_db (sqlite3*   db,
@@ -177,6 +179,8 @@
 
 static void
 midori_bookmarkbar_populate (MidoriBrowser* browser);
+static void
+midori_bookmarkbar_populate_idle (MidoriBrowser* browser);
 
 static void
 midori_bookmarkbar_clear (GtkWidget* toolbar);
@@ -1229,16 +1233,20 @@
         if (new_bookmark)
             katze_array_add_item (browser->bookmarks, bookmark);
         else
+	{
             midori_bookmarks_update_item_db (db, bookmark);
-        midori_browser_update_history (bookmark, "bookmark", new_bookmark ? "create" : "modify");
-
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
-            if (!gtk_widget_get_visible (browser->bookmarkbar))
-                _action_set_active (browser, "Bookmarkbar", TRUE);
+	    midori_browser_update_history (bookmark, "bookmark", "modify");
+
+	    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
+		if (!gtk_widget_get_visible (browser->bookmarkbar))
+		    _action_set_active (browser, "Bookmarkbar", TRUE);
+	    if (gtk_widget_get_visible (browser->bookmarkbar))
+		midori_bookmarkbar_populate (browser);
+	}
+
         return_status = TRUE;
     }
-    if (gtk_widget_get_visible (browser->bookmarkbar))
-        midori_bookmarkbar_populate (browser);
+
     gtk_widget_destroy (dialog);
     return return_status;
 }
@@ -4516,7 +4524,6 @@
         gchar* path = NULL;
         gint64 selected;
         GError* error;
-        sqlite3* db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
 
         if (gtk_combo_box_get_active_iter (combobox, &iter))
             gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 2, &path, -1);
@@ -4544,8 +4551,8 @@
             if (error)
                 g_error_free (error);
         }
-        midori_bookmarks_import_array_db (db, bookmarks, selected);
-        katze_array_update (browser->bookmarks);
+        midori_bookmarks_import_array (browser->bookmarks, bookmarks, selected);
+
         g_object_unref (bookmarks);
         g_free (path);
     }
@@ -5988,6 +5995,21 @@
     }
 }
 
+static gboolean
+midori_browser_idle (gpointer data)
+{
+    MidoriBrowser* browser = MIDORI_BROWSER (data);
+
+    if (browser->bookmarkbar_populate)
+    {
+        midori_bookmarkbar_populate_idle (browser);
+
+        browser->bookmarkbar_populate = FALSE;
+    }
+
+    return FALSE;
+}
+
 static void
 midori_browser_init (MidoriBrowser* browser)
 {
@@ -6447,6 +6469,8 @@
     katze_object_assign (browser->history, NULL);
     katze_object_assign (browser->dial, NULL);
 
+    g_idle_remove_by_data (browser);
+
     G_OBJECT_CLASS (midori_browser_parent_class)->finalize (object);
 }
 
@@ -6982,6 +7006,18 @@
 }
 
 static void
+midori_bookmarkbar_add_item_cb (KatzeArray*    bookmarks,
+				KatzeItem*     item,
+				MidoriBrowser* browser)
+{
+    if (gtk_widget_get_visible (browser->bookmarkbar))
+        midori_bookmarkbar_populate (browser);
+    else if (katze_item_get_meta_boolean (item, "toolbar"))
+	_action_set_active (browser, "Bookmarkbar", TRUE);
+    midori_browser_update_history (item, "bookmark", "created");
+}
+
+static void
 midori_bookmarkbar_remove_item_cb (KatzeArray*    bookmarks,
                                    KatzeItem*     item,
                                    MidoriBrowser* browser)
@@ -6994,6 +7030,16 @@
 static void
 midori_bookmarkbar_populate (MidoriBrowser* browser)
 {
+    if (browser->bookmarkbar_populate)
+        return;
+
+    g_idle_add (midori_browser_idle, browser);
+    browser->bookmarkbar_populate = TRUE;
+}
+
+static void
+midori_bookmarkbar_populate_idle (MidoriBrowser* browser)
+{
     KatzeArray* array;
     KatzeItem* item;
 
@@ -7014,29 +7060,7 @@
 
     KATZE_ARRAY_FOREACH_ITEM (item, array)
     {
-        if (KATZE_ITEM_IS_BOOKMARK (item))
-            midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
-        else
-        {
-            gint64 id = katze_item_get_meta_integer (item, "id");
-            gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id);
-            KatzeArray* subfolder = midori_array_query (browser->bookmarks,
-                "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q",
-                parentid);
-
-                katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item));
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "id", id);
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "toolbar", 1);
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "parentid", 
-                    katze_item_get_meta_integer (item, "parentid"));
-		katze_item_set_uri (KATZE_ITEM (subfolder), NULL);
-		katze_item_set_meta_string (KATZE_ITEM (subfolder), "desc",
-		    katze_item_get_meta_string (KATZE_ITEM (item), "desc"));
-		katze_item_set_meta_integer (KATZE_ITEM (subfolder), "app",
-		    katze_item_get_meta_boolean (KATZE_ITEM (item), "app"));
-                midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder));
-            g_free (parentid);
-        }
+        midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
     }
     _action_set_sensitive (browser, "BookmarkAdd", TRUE);
     _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE);
@@ -7071,8 +7095,13 @@
     MidoriWebSettings* settings;
 
     if (browser->bookmarks != NULL)
+    {
+        g_signal_handlers_disconnect_by_func (browser->bookmarks,
+            midori_bookmarkbar_add_item_cb, browser);
         g_signal_handlers_disconnect_by_func (browser->bookmarks,
             midori_bookmarkbar_remove_item_cb, browser);
+    }
+
     settings = midori_browser_get_settings (browser);
     g_signal_handlers_disconnect_by_func (settings,
         midori_browser_show_bookmarkbar_notify_value_cb, browser);
@@ -7101,6 +7130,8 @@
     g_signal_connect (settings, "notify::show-bookmarkbar",
         G_CALLBACK (midori_browser_show_bookmarkbar_notify_value_cb), browser);
     g_object_notify (G_OBJECT (settings), "show-bookmarkbar");
+    g_signal_connect_after (bookmarks, "add-item",
+        G_CALLBACK (midori_bookmarkbar_add_item_cb), browser);
     g_signal_connect_after (bookmarks, "remove-item",
         G_CALLBACK (midori_bookmarkbar_remove_item_cb), browser);
 }

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2013-07-01 20:20:53 +0000
+++ panels/midori-bookmarks.c	2013-08-05 09:36:27 +0000
@@ -161,22 +161,23 @@
 }
 
 void
-midori_bookmarks_import_array_db (sqlite3*    db,
-                                  KatzeArray* array,
-                                  gint64      parentid)
+midori_bookmarks_import_array (KatzeArray* bookmarks,
+                               KatzeArray* array,
+                               gint64      parentid)
 {
     GList* list;
     KatzeItem* item;
-    gint64 id;
 
-    if (!db)
+    if (!bookmarks)
         return;
 
     KATZE_ARRAY_FOREACH_ITEM_L (item, array, list)
     {
-        id = midori_bookmarks_insert_item_db (db, item, parentid);
+        Katze_item_set_meta_integer (item, "parentid", parentid);
+        katze_array_add_item (bookmarks, item);
         if (KATZE_IS_ARRAY (item))
-            midori_bookmarks_import_array_db (db, KATZE_ARRAY (item), id);
+          midori_bookmarks_import_array (bookmarks, KATZE_ARRAY (item),
+                                         katze_item_get_meta_integer(item, "id"));
     }
     g_list_free (list);
 }
@@ -391,7 +392,7 @@
 
 static void
 midori_bookmarks_add_clicked_cb (GtkWidget* toolitem,
-				                 MidoriBookmarks* bookmarks)
+                                                 MidoriBookmarks* bookmarks)
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (toolitem);
     GtkTreeView* treeview = GTK_TREE_VIEW (bookmarks->treeview);

=== modified file 'panels/midori-bookmarks.h'
--- panels/midori-bookmarks.h	2012-11-25 11:26:03 +0000
+++ panels/midori-bookmarks.h	2013-08-05 09:36:27 +0000
@@ -42,11 +42,6 @@
                                  KatzeItem* item,
                                  gint64     parentid);
 
-void
-midori_bookmarks_import_array_db (sqlite3*    db,
-                                  KatzeArray* array,
-                                  gint64      parentid);
-
 gboolean
 midori_bookmarks_update_item_db (sqlite3*   db,
                                  KatzeItem* item);