procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* dbusbind.c (Fdbus_call_method_asynchronously)

Browse source 
(Fdbus_register_signal, Fdbus_register_method): Check, whether
`dbus-registered-objects-table' is initialized.

Must not be synchronized with the trunk.
This commit is contained in:
Michael Albinus 2010-10-25 13:46:21 +02:00
parent 23c261f58f
commit 655441b28a
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2010-10-25 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (Fdbus_call_method_asynchronously)
(Fdbus_register_signal, Fdbus_register_method): Check, whether
`dbus-registered-objects-table' is initialized.
2010-10-24 Chong Yidong <cyd@stupidchicken.com>
* xterm.c (x_connection_closed): Kill Emacs unconditionally.

12
src/dbusbind.c
View file

@ -1175,6 +1175,10 @@ usage: (dbus-call-method-asynchronously BUS SERVICE PATH INTERFACE METHOD HANDLE
SDATA (interface),
SDATA (method));
/* Check dbus-registered-objects-table. */
if (!HASH_TABLE_P (Vdbus_registered_objects_table))
XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
/* Open a connection to the bus. */
connection = xd_initialize (bus);
@ -1863,6 +1867,10 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
wrong_type_argument (intern ("functionp"), handler);
GCPRO6 (bus, service, path, interface, signal, handler);
/* Check dbus-registered-objects-table. */
if (!HASH_TABLE_P (Vdbus_registered_objects_table))
XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
/* Retrieve unique name of service. If service is a known name, we
will register for the corresponding unique name, if any. Signals
are sent always with the unique name as sender. Note: the unique
@ -1976,6 +1984,10 @@ used for composing the returning D-Bus message. */)
/* TODO: We must check for a valid service name, otherwise there is
a segmentation fault. */
/* Check dbus-registered-objects-table. */
if (!HASH_TABLE_P (Vdbus_registered_objects_table))
XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
/* Open a connection to the bus. */
connection = xd_initialize (bus);