Merge lp:~unity-team/bamf/bamf.export-pid into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Let's make these changes by Jason land ;)

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

This branch broke ABI with:

58 === modified file 'lib/libbamf/bamf-window.h'
59 --- lib/libbamf/bamf-window.h 2012-02-10 19:08:57 +0000
60 +++ lib/libbamf/bamf-window.h 2012-02-15 05:55:22 +0000
61 @@ -104,7 +104,7 @@
62
63 guint32 bamf_window_get_xid (BamfWindow *self);
64
65 -gchar * bamf_window_get_utf8_prop (BamfWindow *self, const char* prop);
66 +guint32 bamf_window_get_pid (BamfWindow *self);

Was that intentional?

[Michal Hruby (mhr3)]

> Was that intentional?

Desrt just shouted at me for it, so I guess it wasn't, re-adding it to this branch.

[lp:~unity-team/bamf/bamf.export-pid]

438. By Michal Hruby on 2012-02-27

Re-add a function lost in the void during merges

439. By Michal Hruby on 2012-02-27

Merge with trunk

[Michal Hruby (mhr3)]

Merge bot ignoring us?

=== modified file 'lib/libbamf/bamf-window.c'
--- lib/libbamf/bamf-window.c	2012-02-10 20:55:38 +0000
+++ lib/libbamf/bamf-window.c	2012-02-15 05:55:22 +0000
@@ -52,6 +52,7 @@
   DBusGConnection *connection;
   DBusGProxy      *proxy;
   guint32          xid;
+  guint32          pid;
   time_t           last_active;
   gint             monitor;
   gchar           *application_id;
@@ -141,6 +142,36 @@
   return (BamfWindowType) type;
 }
 
+guint32 bamf_window_get_pid (BamfWindow *self)
+{
+  BamfWindowPrivate *priv;
+  guint32 pid = 0;
+  GError *error = NULL;
+
+  g_return_val_if_fail (BAMF_IS_WINDOW (self), FALSE);
+  priv = self->priv;
+
+  if (priv->pid != 0)
+    return priv->pid;
+
+  if (!bamf_view_remote_ready (BAMF_VIEW (self)))
+    return 0;
+
+  if (!dbus_g_proxy_call (priv->proxy,
+                          "GetPid",
+                          &error,
+                          G_TYPE_INVALID,
+                          G_TYPE_UINT, &pid,
+                          G_TYPE_INVALID))
+    {
+      g_warning ("Failed to fetch pid: %s", error->message);
+      g_error_free (error);
+      return 0;
+    }
+
+  return pid;
+}
+
 guint32 bamf_window_get_xid (BamfWindow *self)
 {
   BamfWindowPrivate *priv;
@@ -441,6 +472,7 @@
   priv = self->priv = BAMF_WINDOW_GET_PRIVATE (self);
 
   priv->xid = 0;
+  priv->pid = 0;
   priv->monitor = -2;
   priv->maximized = -1;
 

=== modified file 'lib/libbamf/bamf-window.h'
--- lib/libbamf/bamf-window.h	2012-02-10 19:08:57 +0000
+++ lib/libbamf/bamf-window.h	2012-02-15 05:55:22 +0000
@@ -104,7 +104,7 @@
 
 guint32           bamf_window_get_xid                   (BamfWindow *self);
 
-gchar           * bamf_window_get_utf8_prop             (BamfWindow *self, const char* prop);
+guint32           bamf_window_get_pid                   (BamfWindow *self);
 
 gint              bamf_window_get_monitor               (BamfWindow *self);
 

=== modified file 'src/bamf-window.c'
--- src/bamf-window.c	2012-02-10 18:30:25 +0000
+++ src/bamf-window.c	2012-02-15 05:55:22 +0000
@@ -115,6 +115,14 @@
 }
 
 guint32
+bamf_window_get_pid (BamfWindow *window)
+{
+  g_return_val_if_fail (BAMF_IS_WINDOW (window), 0);
+
+  return bamf_legacy_window_get_pid (window->priv->legacy_window);
+}
+
+guint32
 bamf_window_get_xid (BamfWindow *window)
 {
   g_return_val_if_fail (BAMF_IS_WINDOW (window), 0);
@@ -275,6 +283,17 @@
 }
 
 static gboolean
+on_dbus_handle_get_pid (BamfDBusItemWindow *interface,
+                        GDBusMethodInvocation *invocation,
+                        BamfWindow *self)
+{
+  gint pid = bamf_window_get_pid (self);
+  g_dbus_method_invocation_return_value (invocation, g_variant_new ("(u)", pid));
+
+  return TRUE;
+}
+
+static gboolean
 on_dbus_handle_get_xid (BamfDBusItemWindow *interface,
                         GDBusMethodInvocation *invocation,
                         BamfWindow *self)
@@ -493,6 +512,9 @@
   g_signal_connect (self, "monitor-changed", G_CALLBACK (on_monitor_changed), NULL);
 
   /* Registering signal callbacks to reply to dbus method calls */
+  g_signal_connect (self->priv->dbus_iface, "handle-get-pid",
+                    G_CALLBACK (on_dbus_handle_get_pid), self);
+
   g_signal_connect (self->priv->dbus_iface, "handle-get-xid",
                     G_CALLBACK (on_dbus_handle_get_xid), self);
 

=== modified file 'src/bamf-window.h'
--- src/bamf-window.h	2012-02-10 18:30:25 +0000
+++ src/bamf-window.h	2012-02-15 05:55:22 +0000
@@ -68,6 +68,8 @@
 
 guint32            bamf_window_get_xid (BamfWindow *window);
 
+guint32            bamf_window_get_pid (BamfWindow *window);
+
 time_t             bamf_window_last_active (BamfWindow *window);
 
 time_t             bamf_window_opened (BamfWindow *window);

=== modified file 'src/org.ayatana.bamf.view.xml'
--- src/org.ayatana.bamf.view.xml	2012-02-10 18:30:25 +0000
+++ src/org.ayatana.bamf.view.xml	2012-02-15 05:55:22 +0000
@@ -84,6 +84,9 @@
     <method name="GetXid">
       <arg name="xid" type="u" direction="out"/>
     </method>
+    <method name="GetPid">
+      <arg name="pid" type="u" direction="out"/>
+    </method>
     <method name="Transient">
       <arg name="path" type="s" direction="out"/>
     </method>