Changeset 13962

Timestamp:

Feb 4, 2013, 7:26:54 PM (10 years ago)

Author:

jordan

Message:

(2.7x) in the GTK+ client's filterbar, ensure that the two idle functions both return G_SOURCE_REMOVE

File:

• branches/2.7x/gtk/filter.c (modified) (7 diffs)

branches/2.7x/gtk/filter.c

@@ -120 +120 @@
 
 static gboolean
-category_filter_model_update (GtkTreeStore * store)
+category_filter_model_update (gpointer gstore)
 {
     int i, n;
@@ -132 +132 @@
     GtkTreeIter top;
     GtkTreeIter iter;
-    GtkTreeModel * model = GTK_TREE_MODEL (store);
+    GtkTreeStore * store = GTK_TREE_STORE (gstore);
+    GtkTreeModel * model = GTK_TREE_MODEL (gstore);
     GPtrArray * hosts = g_ptr_array_new ();
     GStringChunk * strings = g_string_chunk_new (4096);
@@ -296 +297 @@
     g_hash_table_unref (hosts_hash);
     g_string_chunk_free (strings);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
@@ -377 +378 @@
     if (!pending)
     {
-        GSourceFunc func = (GSourceFunc) category_filter_model_update;
+        GSourceFunc func = category_filter_model_update;
         g_object_set_qdata (o, DIRTY_KEY, GINT_TO_POINTER (1));
         gdk_threads_add_idle (func, category_model);
@@ -652 +653 @@
 }
 
-static void
-activity_filter_model_update (GtkListStore * store)
+static gboolean
+activity_filter_model_update (gpointer gstore)
 {
     GtkTreeIter iter;
-    GtkTreeModel * model = GTK_TREE_MODEL (store);
+    GtkListStore * store = GTK_LIST_STORE (gstore);
+    GtkTreeModel * model = GTK_TREE_MODEL (gstore);
     GObject * o = G_OBJECT (store);
     GtkTreeModel * tmodel = GTK_TREE_MODEL (g_object_get_qdata (o, TORRENT_MODEL_KEY));
@@ -681 +683 @@
 
     } while (gtk_tree_model_iter_next (model, &iter));
+
+    return G_SOURCE_REMOVE;
 }
 
@@ -752 +756 @@
     if (!pending)
     {
-        GSourceFunc func = (GSourceFunc) activity_filter_model_update;
+        GSourceFunc func = activity_filter_model_update;
         g_object_set_qdata (o, DIRTY_KEY, GINT_TO_POINTER (1));
         gdk_threads_add_idle (func, activity_model);