Merge branch 'zbrown/pending' into 'main'
authorBenjamin Otte <otte.benjamin@googlemail.com>
Wed, 26 Jul 2023 04:39:13 +0000 (04:39 +0000)
committerBenjamin Otte <otte.benjamin@googlemail.com>
Wed, 26 Jul 2023 04:52:02 +0000 (00:52 -0400)
filterlistmodel: emit ::notify::pending after ::items-changed

See merge request GNOME/gtk!6213

(cherry picked from commit f0f7613adb4cb90826d65f60258c5cd1b529dc77)

72a1bd64 filterlistmodel: emit ::notify::pending after ::items-changed

gtk/gtkfilterlistmodel.c

index 1804b7d12a37d20519c62a926ded3b20a902914d..3e0e4d78507d09e136c2ec629e88902c925296bf 100644 (file)
@@ -180,9 +180,6 @@ gtk_filter_list_model_run_filter (GtkFilterListModel *self,
     gtk_bitset_remove_range_closed (self->pending, 0, pos - 1);
   else
     g_clear_pointer (&self->pending, gtk_bitset_unref);
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PENDING]);
-
-  return;
 }
 
 static void
@@ -237,6 +234,7 @@ gtk_filter_list_model_run_filter_cb (gpointer data)
     gtk_filter_list_model_stop_filtering (self);
 
   gtk_filter_list_model_emit_items_changed_for_changes (self, old);
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PENDING]);
 
   return G_SOURCE_CONTINUE;
 }
@@ -857,6 +855,7 @@ gtk_filter_list_model_set_incremental (GtkFilterListModel *self,
       gtk_filter_list_model_stop_filtering (self);
 
       gtk_filter_list_model_emit_items_changed_for_changes (self, old);
+      g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PENDING]);
     }
 
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_INCREMENTAL]);