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

[André Auzi]

Delaye bookmark inserts to handle move operations

This is the last step of fix-1179200

It introduces a first derivation of GtkTreeStore for DND drop destination control.

Inserts are delayed to handle move operations where move is actually an insert at destination, followed by a delete at the source and finally a row change callback.

Be aware that everything's not solved, basically both bookmark bar and bookmark panel interract well, one being updated when operations are done on the other.

From my testing, I've seen there's still an update issue of folders in the bookmark menu.

[André Auzi (aauzi)]

Updated to stay in sync with lp:midori.

This step comes after step 8 (branch lp:~aauzi/midori/fix-1179200-8) but remains independent of step 7 which adds database transactions.

[Cris Dywan (kalikiana)]

Maybe it's a little overkill too pass column types to the bookmarks store as opposed to hard-coding the right types; no strong opinion whilst the code is already there.

Note: I'm giving primarily technical review not real life stress testing, somebody else *must* try this, I'm not eager to get more regressions in.

review: Approve (code-review)

[RabbitBot (rabbitbot-a)]

Attempt to merge into lp:midori failed due to conflicts:

text conflict in panels/midori-bookmarks.c

Unmerged revisions

6334. By André Auzi on 2014-01-30

merge lp:midori after merge of fix-1179200-8

6333. By André Auzi on 2014-01-24

merge fix-1179200-8

6332. By André Auzi on 2013-09-28

merge lp:midori

6331. By André Auzi on 2013-09-18

Derivation of GtkTreeStore for DND drop destination control.

Inserts are delayed to handle move operations where move is actually an insert at destination, followed by a delete at the source and finally a row change callback.

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2014-01-24 23:04:05 +0000
+++ panels/midori-bookmarks.c	2014-01-30 21:02:51 +0000
@@ -26,6 +26,111 @@
 
 #define COMPLETION_DELAY 200
 
+G_BEGIN_DECLS
+
+#define MIDORI_BOOKMARKS_TREE_STORE_TYPE \
+    (midori_bookmarks_tree_store_get_type ())
+#define MIDORI_BOOKMARKS_TREE_STORE(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_BOOKMARKS_TREE_STORE_TYPE, MidoriBookmarksTreeStore))
+#define MIDORI_BOOKMARKS_TREE_STORE_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST ((klass), MIDORI_BOOKMARKS_TREE_STORE_TYPE, MidoriBookmarksTreeStoreClass))
+
+static gboolean
+midori_bookmarks_tree_store_row_drop_possible (GtkTreeDragDest   *drag_dest,
+					      GtkTreePath       *dest_path,
+					      GtkSelectionData  *selection_data);
+
+typedef struct _MidoriBookmarksTreeStore                MidoriBookmarksTreeStore;
+typedef struct _MidoriBookmarksTreeStoreClass           MidoriBookmarksTreeStoreClass;
+
+struct _MidoriBookmarksTreeStore
+{
+    GtkTreeStore parent_instance;
+};
+
+struct _MidoriBookmarksTreeStoreClass
+{
+    GtkTreeStoreClass parent_class;
+};
+
+static GtkTreeDragDestIface *
+gtk_tree_store_gtk_tree_drag_dest_iface = NULL;
+
+static void
+midori_bookmarks_tree_store_drag_dest_init (GtkTreeDragDestIface *iface)
+{
+    gtk_tree_store_gtk_tree_drag_dest_iface = g_type_interface_peek_parent (iface);
+
+    iface->row_drop_possible = midori_bookmarks_tree_store_row_drop_possible;
+}
+
+static void
+midori_bookmarks_tree_store_init (MidoriBookmarksTreeStore* item)
+{
+}
+
+static void
+midori_bookmarks_tree_store_class_init (MidoriBookmarksTreeStoreClass *class)
+{
+}
+
+G_DEFINE_TYPE_WITH_CODE (MidoriBookmarksTreeStore,
+			 midori_bookmarks_tree_store,
+			 GTK_TYPE_TREE_STORE,
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_DEST,
+						midori_bookmarks_tree_store_drag_dest_init));
+
+
+GtkTreeStore*
+midori_bookmarks_tree_store_new (gint n_columns, ...)
+{
+    GtkTreeStore* tree_store = GTK_TREE_STORE (g_object_new (MIDORI_BOOKMARKS_TREE_STORE_TYPE, NULL));
+    va_list ap;
+    GType* types;
+    gint n;
+
+    if (!tree_store)
+        return NULL;
+
+    types = g_new (GType, n_columns);
+
+    if (!types)
+    {
+        g_object_unref(tree_store);
+        return NULL;
+    }
+
+    va_start(ap, n_columns);
+    for (n = 0; n < n_columns; n++)
+    {
+        types[n] = va_arg(ap, GType);
+    }
+    va_end(ap);
+
+    gtk_tree_store_set_column_types (tree_store,
+        n_columns,
+        types);
+
+    g_free (types);
+    return tree_store;
+}
+
+
+GtkTreeStore*
+midori_bookmarks_tree_store_newv (gint n_columns, GType *types)
+{
+    GtkTreeStore* tree_store = GTK_TREE_STORE (g_object_new (MIDORI_BOOKMARKS_TREE_STORE_TYPE, NULL));
+
+    if (!tree_store)
+	return NULL;
+
+    gtk_tree_store_set_column_types (tree_store,
+				     n_columns,
+				     types);
+
+    return tree_store;
+}
+
 gboolean
 midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
                                          KatzeItem*     bookmark_or_parent,
@@ -50,6 +155,7 @@
     gint filter_timeout;
     gchar* filter;
 
+    GList* pending_inserts;
     KatzeItem* hovering_item;
 };
 
@@ -353,15 +459,39 @@
 static void
 midori_bookmarks_add_item (KatzeItem*       item,
                            MidoriBookmarks* bookmarks);
+
+static gboolean
+midori_bookmarks_idle (MidoriBookmarks* bookmarks)
+{
+    GList* list_iter;
+
+    for (list_iter = bookmarks->pending_inserts; list_iter; list_iter = g_list_next (list_iter))
+    {
+        KatzeItem *item = KATZE_ITEM (list_iter->data);
+
+        midori_bookmarks_add_item (item, bookmarks);
+
+        g_object_unref (item);
+    }
+
+    g_list_free (bookmarks->pending_inserts);
+    bookmarks->pending_inserts = NULL;
+
+    return FALSE;
+}
+
 static void
 midori_bookmarks_add_item_cb (KatzeArray*      array,
                               KatzeItem*       item,
                               MidoriBookmarks* bookmarks)
 {
-    midori_bookmarks_add_item (item, bookmarks);
+    if (!bookmarks->pending_inserts)
+        g_idle_add ((GSourceFunc)midori_bookmarks_idle, bookmarks);
+
+    g_object_ref (item);
+    bookmarks->pending_inserts = g_list_append (bookmarks->pending_inserts, item);
 }
 
-
 static void
 midori_bookmarks_add_item (KatzeItem*       item,
                            MidoriBookmarks* bookmarks)
@@ -493,6 +623,42 @@
 }
 
 
+static gboolean
+midori_bookmarks_tree_store_row_drop_possible (GtkTreeDragDest*  drag_dest,
+					                           GtkTreePath*      dest_path,
+					                           GtkSelectionData* selection_data)
+{
+    gboolean row_drop_possible =
+     gtk_tree_store_gtk_tree_drag_dest_iface->row_drop_possible (drag_dest,
+         dest_path,
+         selection_data);
+
+    if (!row_drop_possible)
+        return FALSE;
+
+    if ((!gtk_tree_path_get_depth(dest_path) > 1)
+        && gtk_tree_path_up(dest_path))
+    {
+        GtkTreeModel* model = GTK_TREE_MODEL(drag_dest);
+        GtkTreeIter iter;
+
+        if (gtk_tree_model_get_iter (model, &iter, dest_path))
+        {
+            KatzeItem* item;
+
+            gtk_tree_model_get (model, &iter, 0, &item, -1);
+
+            if (!KATZE_ITEM_IS_FOLDER(item))
+                row_drop_possible = FALSE;
+
+            if (item)
+                g_object_unref (item);
+        }
+    }
+
+    return row_drop_possible;
+}
+
 static void
 midori_bookmarks_row_changed_cb (GtkTreeModel*    model,
                                  GtkTreePath*     path,
@@ -501,23 +667,26 @@
 {
     KatzeItem* item;
     GtkTreeIter parent;
-    KatzeItem* new_parent = NULL;
-    gint64 parentid;
-
+    gint64 parentid = 0;
+ 
     gtk_tree_model_get (model, iter, 0, &item, -1);
 
+    if (!KATZE_IS_ITEM (item))
+	return;
+
     if (gtk_tree_model_iter_parent (model, &parent, iter))
     {
+        KatzeItem* new_parent;
+
         gtk_tree_model_get (model, &parent, 0, &new_parent, -1);
 
-        /* Bookmarks must not be moved into non-folder items */
-        if (!KATZE_ITEM_IS_FOLDER (new_parent))
-            parentid = 0;
-        else
-            parentid = katze_item_get_meta_integer (new_parent, "id");
+        /* Bookmarks cannot be moved into non-folder items */
+        g_assert (KATZE_ITEM_IS_FOLDER (new_parent));
+
+        parentid = katze_item_get_meta_integer (new_parent, "id");
+
+        g_object_unref (new_parent);
     }
-    else
-        parentid = 0;
 
     katze_item_set_meta_integer (item, "parentid", parentid);
 
@@ -532,8 +701,6 @@
         bookmarks);
 
     g_object_unref (item);
-    if (new_parent)
-        g_object_unref (new_parent);
 }
 
 static void
@@ -1359,7 +1526,7 @@
     gtk_box_pack_start (GTK_BOX (bookmarks), box, FALSE, FALSE, 5);
 
     /* Create the treeview */
-    model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING);
+    model = midori_bookmarks_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING);
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
     gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
@@ -1409,6 +1576,7 @@
     gtk_widget_show (treeview);
     gtk_box_pack_start (GTK_BOX (bookmarks), treeview, TRUE, TRUE, 0);
     bookmarks->treeview = treeview;
+    bookmarks->pending_inserts = NULL;
     bookmarks->hovering_item = NULL;
 }