diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-01 11:18:42 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-01 11:18:42 -0400 |
| commit | 91fd0b72816c99c0425ab783f6502a3e11f00956 (patch) | |
| tree | ef448f802994bd3b06c612a06e1ffd93f9493c6f | |
| parent | a8039db123e0cdec9ce3bbc52bae6fbc8d99ca4c (diff) | |
| download | emacs-91fd0b72816c99c0425ab783f6502a3e11f00956.tar.gz emacs-91fd0b72816c99c0425ab783f6502a3e11f00956.tar.bz2 emacs-91fd0b72816c99c0425ab783f6502a3e11f00956.zip | |
Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dbusbind.c | 12 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 868688f8c45..c76c62124fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -78,12 +78,6 @@ when aborting on GTK. This requires using shut_down_emacs directly instead of Fkill_emacs. -2010-10-31 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-29 Eli Zaretskii <eliz@gnu.org> * emacs.c (main): Call syms_of_filelock unconditionally. diff --git a/src/dbusbind.c b/src/dbusbind.c index beb1faaf4aa..683b7cb583b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -1232,10 +1232,6 @@ 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, TRUE); @@ -1873,10 +1869,6 @@ 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 @@ -1989,10 +1981,6 @@ 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, TRUE); |