GtkMenuTracker: make "is-visible" a property

Make this a property just like all of the other things and make the APIs
for accessing it non-private (but add a note that they are not intended
to be used).

3 files changed, 29 insertions, 14 deletions

diff --git a/gtk/gtkmenutracker.c b/gtk/gtkmenutracker.c
index 86ee9fca5d..ee6f8b0dd7 100644
--- a/gtk/gtkmenutracker.c
+++ b/gtk/gtkmenutracker.c
@@ -367,19 +367,19 @@ gtk_menu_tracker_add_items (GtkMenuTracker         *tracker,
            * case that we want to show a separator, but we will never do
            * that because separators are not shown for this fake section.
            */
-          if (_gtk_menu_tracker_item_may_disappear (item))
+          if (gtk_menu_tracker_item_may_disappear (item))
             {
               GtkMenuTrackerSection *fake_section;
 
               fake_section = g_slice_new0 (GtkMenuTrackerSection);
               fake_section->is_fake = TRUE;
               fake_section->model = g_object_ref (item);
-              fake_section->handler = g_signal_connect (item, "visibility-changed",
+              fake_section->handler = g_signal_connect (item, "notify::is-visible",
                                                         G_CALLBACK (gtk_menu_tracker_item_visibility_changed),
                                                         tracker);
               *change_point = g_slist_prepend (*change_point, fake_section);
 
-              if (_gtk_menu_tracker_item_is_visible (item))
+              if (gtk_menu_tracker_item_get_is_visible (item))
                 {
                   (* tracker->insert_func) (item, offset, tracker->user_data);
                   fake_section->items = g_slist_prepend (NULL, NULL);
diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c
index 869251c5ef..549e979c61 100644
--- a/gtk/gtkmenutrackeritem.c
+++ b/gtk/gtkmenutrackeritem.c
@@ -114,11 +114,11 @@ enum {
   PROP_TOGGLED,
   PROP_ACCEL,
   PROP_SUBMENU_SHOWN,
+  PROP_IS_VISIBLE,
   N_PROPS
 };
 
 static GParamSpec *gtk_menu_tracker_item_pspecs[N_PROPS];
-static guint gtk_menu_tracker_visibility_changed_signal;
 
 static void gtk_menu_tracker_item_init_observer_iface (GtkActionObserverInterface *iface);
 G_DEFINE_TYPE_WITH_CODE (GtkMenuTrackerItem, gtk_menu_tracker_item, G_TYPE_OBJECT,
@@ -184,6 +184,9 @@ gtk_menu_tracker_item_get_property (GObject    *object,
     case PROP_SUBMENU_SHOWN:
       g_value_set_boolean (value, gtk_menu_tracker_item_get_submenu_shown (self));
       break;
+    case PROP_IS_VISIBLE:
+      g_value_set_boolean (value, gtk_menu_tracker_item_get_is_visible (self));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -236,13 +239,10 @@ gtk_menu_tracker_item_class_init (GtkMenuTrackerItemClass *class)
     g_param_spec_string ("accel", "", "", NULL, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
   gtk_menu_tracker_item_pspecs[PROP_SUBMENU_SHOWN] =
     g_param_spec_boolean ("submenu-shown", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
+  gtk_menu_tracker_item_pspecs[PROP_IS_VISIBLE] =
+    g_param_spec_boolean ("is-visible", "", "", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
 
   g_object_class_install_properties (class, N_PROPS, gtk_menu_tracker_item_pspecs);
-
-  gtk_menu_tracker_visibility_changed_signal = g_signal_new ("visibility-changed", GTK_TYPE_MENU_TRACKER_ITEM,
-                                                             G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
-                                                             g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE,
-                                                             1, G_TYPE_BOOLEAN);
 }
 
 /* This syncs up the visibility for the hidden-when='' case.  We call it
@@ -276,7 +276,7 @@ gtk_menu_tracker_item_update_visibility (GtkMenuTrackerItem *self)
   if (visible != self->is_visible)
     {
       self->is_visible = visible;
-      g_signal_emit (self, gtk_menu_tracker_visibility_changed_signal, 0, visible);
+      g_object_notify (G_OBJECT (self), "is-visible");
     }
 }
 
@@ -878,14 +878,29 @@ gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self,
     gtk_menu_tracker_item_set_submenu_shown (self, shown);
 }
 
+/**
+ * gtk_menu_tracker_item_get_is_visible:
+ * @self: A #GtkMenuTrackerItem instance
+ *
+ * Don't use this unless you're tracking items for yourself -- normally
+ * the tracker will emit add/remove automatically when this changes.
+ *
+ * Returns: if the item should currently be shown
+ */
 gboolean
-_gtk_menu_tracker_item_is_visible (GtkMenuTrackerItem *self)
+gtk_menu_tracker_item_get_is_visible (GtkMenuTrackerItem *self)
 {
   return self->is_visible;
 }
 
+/**
+ * gtk_menu_tracker_item_may_disappear:
+ * @self: A #GtkMenuTrackerItem instance
+ *
+ * Returns: if the item may disappear (ie: is-visible property may change)
+ */
 gboolean
-_gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self)
+gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self)
 {
   return self->hidden_when != HIDDEN_NEVER;
 }
diff --git a/gtk/gtkmenutrackeritem.h b/gtk/gtkmenutrackeritem.h
index 61bf2502e9..859022d466 100644
--- a/gtk/gtkmenutrackeritem.h
+++ b/gtk/gtkmenutrackeritem.h
@@ -72,9 +72,9 @@ GMenuModel *           _gtk_menu_tracker_item_get_submenu               (GtkMenu
 
 gchar *                _gtk_menu_tracker_item_get_submenu_namespace     (GtkMenuTrackerItem *self);
 
-gboolean               _gtk_menu_tracker_item_may_disappear             (GtkMenuTrackerItem *self);
+gboolean                gtk_menu_tracker_item_may_disappear             (GtkMenuTrackerItem *self);
 
-gboolean               _gtk_menu_tracker_item_is_visible                (GtkMenuTrackerItem *self);
+gboolean                gtk_menu_tracker_item_get_is_visible            (GtkMenuTrackerItem *self);
 
 gboolean                gtk_menu_tracker_item_get_should_request_show   (GtkMenuTrackerItem *self);