mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-26 07:30:08 +01:00
29 lines
835 B
Diff
29 lines
835 B
Diff
Index: dbus/dbus-bus.c
|
|
===================================================================
|
|
RCS file: /cvs/dbus/dbus/dbus/dbus-bus.c,v
|
|
retrieving revision 1.64
|
|
diff -u -r1.64 dbus-bus.c
|
|
--- dbus/dbus-bus.c 28 Oct 2006 01:41:37 -0000 1.64
|
|
+++ dbus/dbus-bus.c 8 Mar 2007 20:25:40 -0000
|
|
@@ -350,8 +350,10 @@
|
|
{
|
|
int i;
|
|
|
|
+#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
|
|
+ // qt example pong says "QMutex::lock: Deadlock detected"
|
|
_DBUS_LOCK (bus);
|
|
-
|
|
+#endif
|
|
/* We are expecting to have the connection saved in only one of these
|
|
* slots, but someone could in a pathological case set system and session
|
|
* bus to the same bus or something. Or set one of them to the starter
|
|
@@ -366,7 +368,9 @@
|
|
}
|
|
}
|
|
|
|
+#if !defined(DBUS_WIN) && !defined(DBUS_WINCE)
|
|
_DBUS_UNLOCK (bus);
|
|
+#endif
|
|
}
|
|
|
|
static DBusConnection *
|