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

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 473
Merged at revision: 473
Proposed branch: lp:~paulliu/bamf/fix-dbus-types-error
Merge into: lp:bamf/0.4
Diff against target: 12 lines (+1/-1)
1 file modified
lib/libbamf/bamf-control.c (+1/-1)
To merge this branch: bzr merge lp:~paulliu/bamf/fix-dbus-types-error
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+113493@code.launchpad.net

Commit message

Fix type mismatch in bamf_control_register_application_for_pid() and the dbus interface

(LP: #1021143)

Description of the change

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

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

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

Thanks!

review: Approve
Unity Merger (unity-merger) wrote :

No commit message specified.

Unity Merger (unity-merger) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/libbamf/bamf-control.c'
2--- lib/libbamf/bamf-control.c 2012-02-27 18:33:27 +0000
3+++ lib/libbamf/bamf-control.c 2012-07-05 06:36:20 +0000
4@@ -180,7 +180,7 @@
5 "RegisterApplicationForPid",
6 &error,
7 G_TYPE_STRING, application,
8- G_TYPE_UINT, pid,
9+ G_TYPE_INT, pid,
10 G_TYPE_INVALID,
11 G_TYPE_INVALID))
12 {

Subscribers

People subscribed via source and target branches