git.iko.soy/unity8
on xenial help sign in
Fixing object paths
45148f6Ted Gould
plugins/Unity/Launcher/backend/launcherbackend.cpp+5−3
compare with xenial
unifiedsplit
@@ -50,8 +50,10 @@ LauncherBackend::LauncherBackend(QObject *parent):
50
50
51 /* Set up ourselves on DBus */
51 /* Set up ourselves on DBus */
52 QDBusConnection con = QDBusConnection::sessionBus();
52 QDBusConnection con = QDBusConnection::sessionBus();
53− con.registerService("com.canonical.unity.launcher");
53+ if (!con.registerService("com.canonical.unity.launcher"))
54+ qDebug() << "Unable to register launcher name";
54− con.registerObject("/com/canonical/unity/launcher/", this);
55+ if (!con.registerObject("/com/canonical/unity/launcher", this))
56+ qDebug() << "Unable to register launcher object";
55}
57}
56
58
57LauncherBackend::~LauncherBackend()
59LauncherBackend::~LauncherBackend()
@@ -59,7 +61,7 @@ LauncherBackend::~LauncherBackend()
59 /* Remove oursevles from DBus */
61 /* Remove oursevles from DBus */
60 QDBusConnection con = QDBusConnection::sessionBus();
62 QDBusConnection con = QDBusConnection::sessionBus();
61 con.unregisterService("com.canonical.unity.launcher");
63 con.unregisterService("com.canonical.unity.launcher");
62− con.unregisterObject("/com/canonical/unity/launcher/");
64+ con.unregisterObject("/com/canonical/unity/launcher");
63
65
64 /* Clear data */
66 /* Clear data */
65 m_storedApps.clear();
67 m_storedApps.clear();