forked from pool/libqt5-qtbase
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
From 2160e7e0b7842d4ef49fdd435b4a7f127d479b90 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jakub Adam <jakub.adam@jollamobile.com>
|
||
|
|
Date: Wed, 4 Jun 2014 14:48:02 +0200
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
---
|
||
|
|
src/dbus/qdbusintegrator.cpp | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
|
||
|
|
index 1fef6d4..d4079e8 100644
|
||
|
|
--- a/src/dbus/qdbusintegrator.cpp
|
||
|
|
+++ b/src/dbus/qdbusintegrator.cpp
|
||
|
|
@@ -2272,7 +2272,7 @@ QDBusConnectionPrivate::disconnectSignal
|
||
|
|
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)));
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.0.1
|