mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-06 12:50:29 +01:00
f349e6b8c5
* 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
48 lines
1.1 KiB
Makefile
48 lines
1.1 KiB
Makefile
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
|
|
|
|
if HAVE_GLIB
|
|
GLIB_TOOLS=dbus-monitor
|
|
else
|
|
GLIB_TOOLS=
|
|
endif
|
|
|
|
if HAVE_GTK
|
|
GTK_TOOLS=dbus-viewer
|
|
else
|
|
GTK_TOOLS=
|
|
endif
|
|
|
|
bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
|
|
|
|
dbus_send_SOURCES= \
|
|
dbus-print-message.c \
|
|
dbus-print-message.h \
|
|
dbus-send.c
|
|
|
|
dbus_monitor_SOURCES= \
|
|
dbus-monitor.c \
|
|
dbus-print-message.c \
|
|
dbus-print-message.h
|
|
|
|
dbus_launch_SOURCES= \
|
|
dbus-launch.c
|
|
|
|
dbus_cleanup_sockets_SOURCES= \
|
|
dbus-cleanup-sockets.c
|
|
|
|
dbus_viewer_SOURCES= \
|
|
dbus-names-model.c \
|
|
dbus-names-model.h \
|
|
dbus-tree-view.c \
|
|
dbus-tree-view.h \
|
|
dbus-viewer.c
|
|
|
|
dbus_send_LDADD= $(top_builddir)/dbus/libdbus-1.la
|
|
dbus_monitor_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
|
|
dbus_launch_LDADD= $(DBUS_X_LIBS)
|
|
dbus_viewer_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS)
|
|
|
|
man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
|
|
EXTRA_DIST = $(man_MANS)
|
|
|
|
|