[Xfce4-commits] <midori:master> Remove invisible dummy row when expanding, and add it when collapsing

[Christian Dywan]

Updating branch refs/heads/master
         to 24b0916d628498685fa28c9a526be4932f065ca1 (commit)
       from e15fe776edb1e7139f938c6a43b0e4957e85c5d4 (commit)

commit 24b0916d628498685fa28c9a526be4932f065ca1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Feb 8 00:12:15 2010 +0100

    Remove invisible dummy row when expanding, and add it when collapsing

 panels/midori-history.c |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/panels/midori-history.c b/panels/midori-history.c
index bfd9ba6..87aac38 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -202,7 +202,8 @@ midori_history_read_from_db (MidoriHistory* history,
     }
     g_free (sqlcmd);
 
-    current_time = time (NULL);
+    if (req_day == 0)
+        current_time = time (NULL);
 
     while ((result = sqlite3_step (statement)) == SQLITE_ROW)
     {
@@ -257,7 +258,6 @@ midori_history_read_from_db (MidoriHistory* history,
             gtk_tree_store_insert_with_values (model, &root_iter, NULL,
                                                0, 0, item, 1, sdate, -1);
             /* That's an invisible dummy, so we always have an expander */
-            /* FIXME: Hide this row */
             gtk_tree_store_insert_with_values (model, &iter, &root_iter,
                 0, 0, NULL, 1, NULL, -1);
 
@@ -282,6 +282,15 @@ midori_history_read_from_db (MidoriHistory* history,
         }
     }
 
+    if (req_day != 0)
+    {
+        /* Remove invisible dummy row */
+        GtkTreeIter child;
+        gint last = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (model), parent);
+        gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (model), &child, parent, last - 1);
+        gtk_tree_store_remove (model, &child);
+    }
+
     if (result != SQLITE_DONE)
         g_print (_("Failed to execute database statement: %s\n"),
                  sqlite3_errmsg (db));
@@ -829,33 +838,19 @@ midori_history_row_collapsed_cb (GtkTreeView *treeview,
                                  gpointer     user_data)
 {
     GtkTreeModel* model;
+    GtkTreeStore* treestore;
     GtkTreeIter child;
 
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
-    while (gtk_tree_model_iter_n_children (model, parent) > 1)
-    {
-        if (gtk_tree_model_iter_children (model, &child, parent))
-            gtk_tree_store_remove (GTK_TREE_STORE (model), &child);
-    }
+    treestore = GTK_TREE_STORE (model);
+    while (gtk_tree_model_iter_nth_child (model, &child, parent, 0))
+        gtk_tree_store_remove (treestore, &child);
+    /* That's an invisible dummy, so we always have an expander */
+    gtk_tree_store_insert_with_values (treestore, &child, parent,
+        0, 0, NULL, 1, NULL, -1);
 }
 #endif
 
-static gboolean
-midori_history_row_sep_func (GtkTreeModel*  model,
-                             GtkTreeIter*   iter,
-                             MidoriHistory* history)
-{
-    KatzeItem* item;
-
-    gtk_tree_model_get (model, iter, 0, &item, -1);
-
-    if (item == NULL)
-        return TRUE;
-
-    g_object_unref (item);
-    return FALSE;
-}
-
 static void
 midori_history_init (MidoriHistory* history)
 {
@@ -872,8 +867,6 @@ midori_history_init (MidoriHistory* history)
     model = gtk_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_row_separator_func (GTK_TREE_VIEW (treeview),
-        (GtkTreeViewRowSeparatorFunc)midori_history_row_sep_func, history, NULL);
     column = gtk_tree_view_column_new ();
     renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
     gtk_tree_view_column_pack_start (column, renderer_pixbuf, FALSE);