Merge lp:~3v1n0/bamf/windows-signal-merge into lp:bamf

[Marco Trevisan (Treviño)]

BamfApplication: bind window-{added,removed} signals to child-{added,removed} ones

And deprecate dbus Window{Added,Removed} signals as well

[Andrea Azzarone (azzar1)]

+1

review: Approve

[lp:~3v1n0/bamf/windows-signal-merge]

632. By Rico Tzschichholz on 2016-03-29

BamfApplication: avoid chaining-up signals. Just use child-{added,removed} ones

=== modified file 'lib/libbamf-private/org.ayatana.bamf.view.xml'
--- lib/libbamf-private/org.ayatana.bamf.view.xml	2016-02-25 14:51:27 +0000
+++ lib/libbamf-private/org.ayatana.bamf.view.xml	2016-03-29 23:36:56 +0000
@@ -98,9 +98,11 @@
       <arg name="path" type="s" direction="out"/>
     </method>
     <signal name="WindowRemoved">
+      <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
       <arg name="path" type="s"/>
     </signal>
     <signal name="WindowAdded">
+      <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
       <arg name="path" type="s"/>
     </signal>
     <signal name="SupportedMimeTypesChanged">

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2015-04-22 15:53:12 +0000
+++ lib/libbamf/bamf-application.c	2016-03-29 23:36:56 +0000
@@ -471,16 +471,8 @@
 }
 
 static void
-bamf_application_on_window_added (BamfDBusItemApplication *proxy, const char *path, BamfApplication *self)
+bamf_application_on_child_added (BamfApplication *self, BamfView *view)
 {
-  BamfView *view;
-  BamfFactory *factory;
-
-  g_return_if_fail (BAMF_IS_APPLICATION (self));
-
-  factory = _bamf_factory_get_default ();
-  view = _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
-
   if (BAMF_IS_WINDOW (view))
     {
       guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
@@ -495,16 +487,8 @@
 }
 
 static void
-bamf_application_on_window_removed (BamfDBusItemApplication *proxy, const char *path, BamfApplication *self)
+bamf_application_on_child_removed (BamfApplication *self, BamfView *view)
 {
-  BamfView *view;
-  BamfFactory *factory;
-
-  g_return_if_fail (BAMF_IS_APPLICATION (self));
-
-  factory = _bamf_factory_get_default ();
-  view = _bamf_factory_view_for_path_type (factory, path, BAMF_FACTORY_WINDOW);
-
   if (BAMF_IS_WINDOW (view))
     {
       guint32 xid = bamf_window_get_xid (BAMF_WINDOW (view));
@@ -615,12 +599,6 @@
   g_signal_connect (priv->proxy, "desktop-file-updated",
                     G_CALLBACK (bamf_application_on_desktop_file_updated), view);
 
-  g_signal_connect (priv->proxy, "window-added",
-                    G_CALLBACK (bamf_application_on_window_added), view);
-
-  g_signal_connect (priv->proxy, "window-removed",
-                    G_CALLBACK (bamf_application_on_window_removed), view);
-
   g_signal_connect (priv->proxy, "supported-mime-types-changed",
                     G_CALLBACK (bamf_application_on_supported_mime_types_changed), view);
 
@@ -760,7 +738,6 @@
                   BAMF_TYPE_WINDOW);
 }
 
-
 static void
 bamf_application_init (BamfApplication *self)
 {
@@ -768,6 +745,9 @@
 
   priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
   priv->show_stubs = -1;
+
+  g_signal_connect (self, "child-added", G_CALLBACK (bamf_application_on_child_added), NULL);
+  g_signal_connect (self, "child-removed", G_CALLBACK (bamf_application_on_child_removed), NULL);
 }
 
 BamfApplication *

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2016-03-21 14:34:34 +0000
+++ src/bamf-application.c	2016-03-29 23:36:56 +0000
@@ -963,13 +963,6 @@
 }
 
 static void
-view_exported (BamfView *view, BamfApplication *self)
-{
-  g_signal_emit_by_name (self, "window-added", bamf_view_get_path (view));
-  g_signal_handlers_disconnect_by_func (view, view_exported, self);
-}
-
-static void
 bamf_application_child_added (BamfView *view, BamfView *child)
 {
   BamfApplication *application;
@@ -978,22 +971,6 @@
 
   application = BAMF_APPLICATION (view);
 
-  if (BAMF_IS_WINDOW (child))
-    {
-      window = BAMF_WINDOW (child);
-
-      if (bamf_view_is_on_bus (child))
-        {
-          g_signal_emit_by_name (BAMF_APPLICATION (view), "window-added",
-                                 bamf_view_get_path (child));
-        }
-      else
-        {
-          g_signal_connect (G_OBJECT (child), "exported",
-                            (GCallback) view_exported, view);
-        }
-    }
-
   g_signal_connect (G_OBJECT (child), "active-changed",
                     (GCallback) view_active_changed, view);
   g_signal_connect (G_OBJECT (child), "urgent-changed",
@@ -1104,15 +1081,6 @@
   BamfApplication *self = BAMF_APPLICATION (view);
   GList *children, *l;
 
-  if (BAMF_IS_WINDOW (child))
-    {
-      if (bamf_view_is_on_bus (child))
-        g_signal_emit_by_name (BAMF_APPLICATION (view), "window-removed",
-                               bamf_view_get_path (child));
-    }
-
-  g_signal_handlers_disconnect_by_data (G_OBJECT (child), view);
-
   bamf_application_ensure_flags (self);
 
   children = bamf_view_get_children (view);
@@ -1184,17 +1152,17 @@
 }
 
 static void
-on_window_added (BamfApplication *self, const gchar *win_path, gpointer _not_used)
+on_child_added (BamfApplication *self, const gchar *child_path, gpointer _not_used)
 {
   g_return_if_fail (BAMF_IS_APPLICATION (self));
-  g_signal_emit_by_name (self->priv->dbus_iface, "window-added", win_path);
+  g_signal_emit_by_name (self->priv->dbus_iface, "window-added", child_path);
 }
 
 static void
-on_window_removed (BamfApplication *self, const gchar *win_path, gpointer _not_used)
+on_child_removed (BamfApplication *self, const gchar *child_path, gpointer _not_used)
 {
   g_return_if_fail (BAMF_IS_APPLICATION (self));
-  g_signal_emit_by_name (self->priv->dbus_iface, "window-removed", win_path);
+  g_signal_emit_by_name (self->priv->dbus_iface, "window-removed", child_path);
 }
 
 static void
@@ -1415,8 +1383,8 @@
 
   /* We need to connect to the object own signals to redirect them to the dbus
    * interface                                                                */
-  g_signal_connect (self, "window-added", G_CALLBACK (on_window_added), NULL);
-  g_signal_connect (self, "window-removed", G_CALLBACK (on_window_removed), NULL);
+  g_signal_connect (self, "child-added", G_CALLBACK (on_child_added), NULL);
+  g_signal_connect (self, "child-removed", G_CALLBACK (on_child_removed), NULL);
   g_signal_connect (self, "desktop-file-updated", G_CALLBACK (on_desktop_file_updated), NULL);
 
   /* Registering signal callbacks to reply to dbus method calls */

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2016-03-21 14:31:14 +0000
+++ src/bamf-view.c	2016-03-29 23:36:56 +0000
@@ -46,8 +46,6 @@
 enum
 {
   CLOSED_INTERNAL,
-  CHILD_ADDED_INTERNAL,
-  CHILD_REMOVED_INTERNAL,
   EXPORTED,
 
   LAST_SIGNAL,
@@ -342,6 +340,13 @@
   bamf_view_remove_child (view, child);
 }
 
+static void
+on_child_view_exported (BamfView *child, BamfView *view)
+{
+  g_signal_emit_by_name (view, "child-added", bamf_view_get_path (child));
+  g_signal_handlers_disconnect_by_func (child, on_child_view_exported, view);
+}
+
 void
 bamf_view_add_child (BamfView *view,
                      BamfView *child)
@@ -352,20 +357,26 @@
   g_return_if_fail (BAMF_IS_VIEW (child));
 
   g_signal_connect (G_OBJECT (child), "closed-internal",
-                    (GCallback) bamf_view_handle_child_closed, view);
+                    G_CALLBACK (bamf_view_handle_child_closed), view);
 
   /* Make sure our parent child lists are ok, pay attention to whose list you add parents to */
   view->priv->children = g_list_prepend (view->priv->children, child);
   child->priv->parents = g_list_prepend (child->priv->parents, view);
 
+  if (bamf_view_is_on_bus (child))
+    {
+      added = bamf_view_get_path (child);
+      g_signal_emit_by_name (view, "child-added", added);
+    }
+  else
+    {
+      g_signal_connect (G_OBJECT (child), "exported",
+                        G_CALLBACK (on_child_view_exported), view);
+    }
+
   // Do this by hand so we can pass and object instead of a string
   if (BAMF_VIEW_GET_CLASS (view)->child_added)
     BAMF_VIEW_GET_CLASS (view)->child_added (view, child);
-
-  g_signal_emit (view, view_signals[CHILD_ADDED_INTERNAL], 0, child);
-
-  added = bamf_view_get_path (child);
-  g_signal_emit_by_name (view, "child-added", added);
 }
 
 void
@@ -376,14 +387,12 @@
   g_return_if_fail (BAMF_IS_VIEW (view));
   g_return_if_fail (BAMF_IS_VIEW (child));
 
-  g_signal_handlers_disconnect_by_func (child, bamf_view_handle_child_closed, view);
+  g_signal_handlers_disconnect_by_data (child, view);
 
   /* Make sure our parent child lists are ok, pay attention to whose list you add parents to */
   view->priv->children = g_list_remove (view->priv->children, child);
   child->priv->parents = g_list_remove (child->priv->parents, view);
 
-  g_signal_emit (view, view_signals[CHILD_REMOVED_INTERNAL], 0, child);
-
   removed = bamf_view_get_path (child);
   g_signal_emit_by_name (view, "child-removed", removed);
 
@@ -1001,22 +1010,6 @@
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
-  view_signals [CHILD_ADDED_INTERNAL] =
-    g_signal_new ("child-added-internal",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (BamfViewClass, child_added_internal),
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, BAMF_TYPE_VIEW);
-
-  view_signals [CHILD_REMOVED_INTERNAL] =
-    g_signal_new ("child-removed-internal",
-                  G_OBJECT_CLASS_TYPE (klass),
-                  G_SIGNAL_RUN_FIRST,
-                  G_STRUCT_OFFSET (BamfViewClass, child_removed_internal),
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, BAMF_TYPE_VIEW);
-
   view_signals [EXPORTED] =
     g_signal_new ("exported",
                   G_OBJECT_CLASS_TYPE (klass),

=== modified file 'src/bamf-view.h'
--- src/bamf-view.h	2016-01-19 14:54:58 +0000
+++ src/bamf-view.h	2016-03-29 23:36:56 +0000
@@ -57,8 +57,6 @@
 
   /*< signals >*/
   void (* closed_internal)          (BamfView *view);
-  void (* child_added_internal)     (BamfView *view, BamfView *child);
-  void (* child_removed_internal)   (BamfView *view, BamfView *child);
   void (* exported)                 (BamfView *view);
 };