Merge lp://qastaging/~3v1n0/unity/cancellable-gnome-session-manager into lp://qastaging/unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4219
Proposed branch: lp://qastaging/~3v1n0/unity/cancellable-gnome-session-manager
Merge into: lp://qastaging/unity
Diff against target: 189 lines (+24/-20)
5 files modified
UnityCore/GLibDBusProxy.cpp (+12/-8)
UnityCore/GLibDBusProxy.h (+2/-2)
UnityCore/GnomeSessionManager.cpp (+9/-9)
UnityCore/GnomeSessionManagerImpl.h (+1/-0)
unity-shared/SystemdWrapper.cpp (+0/-1)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/cancellable-gnome-session-manager
Reviewer Review Type Date Requested Status
Eleni Maria Stea (community) Approve
Review via email: mp+314925@code.qastaging.launchpad.net

Commit message

GnomeSessionManager: add gcancellable to instance and use it for calls with temporary proxies

This fixes various crashes when the session manager is destroyed while a temporary proxy
call is still in progress, and the callback is called afterwards.

To post a comment you must log in.
Revision history for this message
Eleni Maria Stea (hikiko) wrote :

+1 :)

review: Approve

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.