summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@jollamobile.com>2014-06-04 14:48:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-08 17:00:27 +0200
commitab68958213b607a0f36e624a0a36d0f76aea654c (patch)
treeb2c461d1310d6d10de8a143b5f5a5100fd3abb1f
parentd9a7ad80f78e7346d6f4dbae2cabe31305d6458f (diff)
Use correct signal name when disconnecting "NameOwnerChanged"
A disconnectSignal() call with a wrong signal name caused that hook wasn't found and thus kept in QDBusConnectionPrivate::signalHooks forever. Change-Id: Id7cda225be7580529fc835b377636226abb229f9 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/dbus/qdbusintegrator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 1fef6d4d49..d4079e8076 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -2267,7 +2267,7 @@ QDBusConnectionPrivate::disconnectSignal(SignalHookHash::Iterator &it)
watchedServices.erase(sit);
disconnectSignal(dbusServiceString(), QString(), dbusInterfaceString(),
QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(),
- this, SLOT(_q_serviceOwnerChanged(QString,QString,QString)));
+ this, SLOT(serviceOwnerChangedNoLock(QString,QString,QString)));
}
}
}