dbus ChangeLog,1.697,1.698 configure.in,1.107,1.108
Havoc Pennington
hp at freedesktop.org
Sun Feb 13 09:16:27 PST 2005
Update of /cvs/dbus/dbus
In directory gabe:/tmp/cvs-serv26019
Modified Files:
ChangeLog configure.in
Log Message:
2005-02-13 Havoc Pennington <hp at redhat.com>
* dbus/dbus-object-tree.c (handle_default_introspect_and_unlock):
fix a double-unlock
* dbus/dbus-connection.c
(_dbus_connection_detach_pending_call_unlocked): add this
Initial semi-correct pass through to fix thread locking; there are
still some issues with the condition variable paths I'm pretty
sure
* dbus/dbus-server.c: add a mutex on DBusServer and appropriate
lock/unlock calls
* dbus/dbus-connection.c (_dbus_connection_do_iteration_unlocked):
rename to add _unlocked
(struct DBusConnection): move "dispatch_acquired" and
"io_path_acquired" to use only one bit each.
(CONNECTION_LOCK, CONNECTION_UNLOCK): add checks with !DBUS_DISABLE_CHECKS
(dbus_connection_set_watch_functions): hacky fix to reentrancy
(_dbus_connection_add_watch, _dbus_connection_remove_watch)
(_dbus_connection_toggle_watch, _dbus_connection_add_timeout)
(_dbus_connection_remove_timeout)
(_dbus_connection_toggle_timeout): drop lock when calling out to
user functions; done in a hacky/bad way.
(_dbus_connection_send_and_unlock): add a missing unlock
(_dbus_connection_block_for_reply): add a missing unlock
* dbus/dbus-transport.c (_dbus_transport_get_is_authenticated):
drop lock in a hacky probably unsafe way to call out to user
function
Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -d -r1.697 -r1.698
--- ChangeLog 12 Feb 2005 20:27:45 -0000 1.697
+++ ChangeLog 13 Feb 2005 17:16:25 -0000 1.698
@@ -1,3 +1,36 @@
+2005-02-13 Havoc Pennington <hp at redhat.com>
+
+ * dbus/dbus-object-tree.c (handle_default_introspect_and_unlock):
+ fix a double-unlock
+
+ * dbus/dbus-connection.c
+ (_dbus_connection_detach_pending_call_unlocked): add this
+
+ Initial semi-correct pass through to fix thread locking; there are
+ still some issues with the condition variable paths I'm pretty
+ sure
+
+ * dbus/dbus-server.c: add a mutex on DBusServer and appropriate
+ lock/unlock calls
+
+ * dbus/dbus-connection.c (_dbus_connection_do_iteration_unlocked):
+ rename to add _unlocked
+ (struct DBusConnection): move "dispatch_acquired" and
+ "io_path_acquired" to use only one bit each.
+ (CONNECTION_LOCK, CONNECTION_UNLOCK): add checks with !DBUS_DISABLE_CHECKS
+ (dbus_connection_set_watch_functions): hacky fix to reentrancy
+ (_dbus_connection_add_watch, _dbus_connection_remove_watch)
+ (_dbus_connection_toggle_watch, _dbus_connection_add_timeout)
+ (_dbus_connection_remove_timeout)
+ (_dbus_connection_toggle_timeout): drop lock when calling out to
+ user functions; done in a hacky/bad way.
+ (_dbus_connection_send_and_unlock): add a missing unlock
+ (_dbus_connection_block_for_reply): add a missing unlock
+
+ * dbus/dbus-transport.c (_dbus_transport_get_is_authenticated):
+ drop lock in a hacky probably unsafe way to call out to user
+ function
+
2005-02-12 Havoc Pennington <hp at redhat.com>
* tools/dbus-tree-view.c (info_set_func_text): display more
Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- configure.in 31 Jan 2005 02:55:12 -0000 1.107
+++ configure.in 13 Feb 2005 17:16:25 -0000 1.108
@@ -842,6 +842,7 @@
have_gtk=no
else
PKG_CHECK_MODULES(DBUS_GTK, gtk+-2.0, have_gtk=yes, have_gtk=no)
+ PKG_CHECK_MODULES(DBUS_GTK_THREADS, gtk+-2.0 gthread-2.0, have_gtk_threads=yes, have_gtk_threads=no)
fi
if test x$have_gtk = xno ; then
@@ -863,6 +864,8 @@
dnl Gtk flags
AC_SUBST(DBUS_GTK_CFLAGS)
AC_SUBST(DBUS_GTK_LIBS)
+AC_SUBST(DBUS_GTK_THREADS_CFLAGS)
+AC_SUBST(DBUS_GTK_THREADS_LIBS)
# Qt detection
AC_PATH_PROG(QT_MOC, moc, no)
More information about the dbus-commit
mailing list