diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-04-09 15:19:33 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-04-09 15:19:33 +0200 |
| commit | c477589474d90c81009920b843432875333592b4 (patch) | |
| tree | a11e695cb7955b1f66dc74a5be7b6447db6bd136 /lockscreen | |
| parent | c2788c2f94a4577151cd824fbebf5d32c0a8f326 (diff) | |
| parent | 77ddb5d2a2dfc2f520541142df97699f119a7f6c (diff) | |
Merging with lp:~laney/unity/g-s-replace
Remves the ugly killall (bzr r3736.1.25)
Diffstat (limited to 'lockscreen')
| -rw-r--r-- | lockscreen/ScreenSaverDBusManager.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lockscreen/ScreenSaverDBusManager.cpp b/lockscreen/ScreenSaverDBusManager.cpp index 35b7420bc..64b6a60e0 100644 --- a/lockscreen/ScreenSaverDBusManager.cpp +++ b/lockscreen/ScreenSaverDBusManager.cpp @@ -101,10 +101,7 @@ void DBusManager::EnsureService() { if (!server_) { - // It would be really nicer to have this controlled by upstart - g_spawn_command_line_async("killall -q gnome-screensaver", nullptr); - - server_ = std::make_shared<glib::DBusServer>(dbus::NAME); + server_ = std::make_shared<glib::DBusServer>(dbus::NAME, G_BUS_TYPE_SESSION, G_BUS_NAME_OWNER_FLAGS_REPLACE); server_->AddObject(object_, dbus::OBJECT_PATH); } } |