e483a3c · unity8 · git.iko.soy

on xenial help sign in

And unregister the url-dispatcher well-known dbus name if we are set inactive (shouldn't happen in real practice)

e483a3cMichael Terry10 years ago

plugins/Utils/URLDispatcher.cpp+3−1

@@ -56,8 +56,9 @@ void URLDispatcher::setActive(bool value)

56 if (value == active())

57 return;

59+ QDBusConnection connection = QDBusConnection::sessionBus();

60+

59 if (value) {

61 if (value) {

60− QDBusConnection connection = QDBusConnection::sessionBus();

61 URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);

62 URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);

62 connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),

63 connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),

63 dispatcher,

64 dispatcher,

@@ -65,6 +66,7 @@ void URLDispatcher::setActive(bool value)

65 connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));

66 connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));

66 m_dispatcher = dispatcher;

67 m_dispatcher = dispatcher;

67 } else {

68 } else {

69+ connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));

68 delete m_dispatcher;

70 delete m_dispatcher;

69 m_dispatcher = nullptr;

71 m_dispatcher = nullptr;

70 }

72 }