Ubuntu
gnome-keyring package

Merge lp://qastaging/~mitya57/ubuntu/raring/gnome-keyring/dbus-fixes into lp://qastaging/ubuntu/raring/gnome-keyring

  1. Raring (13.04)
  2. dbus-fixes
  3. Merge into raring
Proposed by Dmitry Shachnev
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp://qastaging/~mitya57/ubuntu/raring/gnome-keyring/dbus-fixes
Merge into: lp://qastaging/ubuntu/raring/gnome-keyring
Diff against target: 4024 lines (+3877/-24)
13 files modified
.pc/00git_fix_introspection.patch/daemon/dbus/gkd-secret-introspect.c (+285/-0)
.pc/00git_fix_searchitems_method.patch/daemon/dbus/gkd-secret-objects.c (+1710/-0)
.pc/00git_fix_searchitems_method.patch/daemon/dbus/gkd-secret-objects.h (+112/-0)
.pc/00git_fix_searchitems_method.patch/daemon/dbus/gkd-secret-service.c (+1598/-0)
.pc/applied-patches (+2/-0)
daemon/dbus/gkd-secret-introspect.c (+2/-3)
daemon/dbus/gkd-secret-objects.c (+29/-19)
daemon/dbus/gkd-secret-objects.h (+2/-1)
daemon/dbus/gkd-secret-service.c (+1/-1)
debian/changelog (+9/-0)
debian/patches/00git_fix_introspection.patch (+26/-0)
debian/patches/00git_fix_searchitems_method.patch (+99/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp://qastaging/~mitya57/ubuntu/raring/gnome-keyring/dbus-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+152580@code.qastaging.launchpad.net

Description of the change

Added two upstream patches to fix D-Bus related issues.

* debian/patches/00git_fix_searchitems_method.patch:
  Upstream patch to fix return value of Collection.SearchItems().
* debian/patches/00git_fix_introspection.patch:
  Upstream patch to fix introspection of some D-Bus methods.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

FWIW, I've also reviewed all the implementations I know to make sure this doesn't cause any regressions:

- libsecret: expect the *right* behavior (confirmed by Stef Walter);
- python-secretstorage: handles both cases correctly;
- ubuntu-sso-client, python-keyring: do not use that function at all.

lp://qastaging/~mitya57/ubuntu/raring/gnome-keyring/dbus-fixes updated
161. By Dmitry Shachnev

Rename 05_fix_introspection.patch to 00git_fix_introspection.patch
now that it has been applied upstream

162. By Dmitry Shachnev

Update .pc directory so that the branch is buildable

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks, uploaded to raring. Upstream asked if you want some fixes backported to the gnome-3-6 serie, it could be good to have those officially in there

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches