Merge lp:~paulliu/bamf/fix-dbus-types-error into lp:bamf/0.4

[Ying-Chun Liu]

Fix type mismatch in bamf_control_register_application_for_pid() and the dbus interface

(LP: #1021143)

Hi,

I get the following warning when using bamf_control_register_application_for_pid()

** (test2:11575): WARNING **: Failed to register application: メッセージの型 '(su)' は期待した型 '(si)' に一致しません

It is because in lib/libbamf/bamf-control.c:
...
  if (!dbus_g_proxy_call (priv->proxy,
                          "RegisterApplicationForPid",
                          &error,
                          G_TYPE_STRING, application,
                          G_TYPE_UINT, pid,
                          G_TYPE_INVALID,
                          G_TYPE_INVALID))
...

However, in src/org.ayatana.bamf.xml:
    <method name="RegisterApplicationForPid">
      <arg name="application" type="s" direction="in"/>
      <arg name="pid" type="i" direction="in"/>
    </method>

I made a patch to correct the problem.
Please merge it.

Thanks,
Paul

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

I think I have fixed this on the upcoming gdbus rewrite, but that's good for now.

Thanks!

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/79/console reported an error when processing this lp:~paulliu/bamf/fix-dbus-types-error branch.
Not merging it.

=== modified file 'lib/libbamf/bamf-control.c'
--- lib/libbamf/bamf-control.c	2012-02-27 18:33:27 +0000
+++ lib/libbamf/bamf-control.c	2012-07-05 06:36:20 +0000
@@ -180,7 +180,7 @@
                           "RegisterApplicationForPid",
                           &error,
                           G_TYPE_STRING, application,
-                          G_TYPE_UINT, pid,
+                          G_TYPE_INT, pid,
                           G_TYPE_INVALID,
                           G_TYPE_INVALID))
     {