diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2014-06-20 15:27:33 +0000 |
|---|---|---|
| committer | CI bot <ps-jenkins@lists.canonical.com> | 2014-06-20 15:27:33 +0000 |
| commit | 44bcea9deba51cee162a1ea4acda35b4a3f5b7bb (patch) | |
| tree | 631eaa41e056641e6c1d14a954e65664acef7491 /tests/backend-dbus/gtest-mock-dbus-fixture.h | |
| parent | c2e6f8bf33ffe3b928f910f46cf175b101fc8ed3 (diff) | |
| parent | 52d94a51a0a4b8660a63f14e37ddf5183b052b02 (diff) | |
| download | ayatana-indicator-session-44bcea9deba51cee162a1ea4acda35b4a3f5b7bb.tar.gz ayatana-indicator-session-44bcea9deba51cee162a1ea4acda35b4a3f5b7bb.tar.bz2 ayatana-indicator-session-44bcea9deba51cee162a1ea4acda35b4a3f5b7bb.zip | |
When logging out, prefer com.canonical.Unity.RequestLogout over org.gnome.SessionManager.Logout. Fixes: 1296814
Diffstat (limited to 'tests/backend-dbus/gtest-mock-dbus-fixture.h')
| -rw-r--r-- | tests/backend-dbus/gtest-mock-dbus-fixture.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/backend-dbus/gtest-mock-dbus-fixture.h b/tests/backend-dbus/gtest-mock-dbus-fixture.h index d4f598c..16b4648 100644 --- a/tests/backend-dbus/gtest-mock-dbus-fixture.h +++ b/tests/backend-dbus/gtest-mock-dbus-fixture.h @@ -43,8 +43,6 @@ class GTestMockDBusFixture: public GTestDBusFixture protected: MockScreenSaver * screen_saver; - MockUnitySession * unity_session; - MockSessionManager * session_manager; MockDisplayManagerSeat * dm_seat; MockAccounts * accounts; MockLogin1Manager * login1_manager; @@ -60,9 +58,7 @@ class GTestMockDBusFixture: public GTestDBusFixture webcredentials = new MockWebcredentials (loop, conn); end_session_dialog = new MockEndSessionDialog (loop, conn); - session_manager = new MockSessionManager (loop, conn); screen_saver = new MockScreenSaver (loop, conn); - unity_session = new MockUnitySession (loop, conn); dm_seat = new MockDisplayManagerSeat (loop, conn); g_setenv ("XDG_SEAT_PATH", dm_seat->path(), TRUE); dm_seat->set_guest_allowed (false); @@ -86,8 +82,6 @@ class GTestMockDBusFixture: public GTestDBusFixture delete login1_manager; delete dm_seat; delete screen_saver; - delete unity_session; - delete session_manager; delete end_session_dialog; delete webcredentials; |