aboutsummaryrefslogtreecommitdiffstats
path: root/src/dbusbind.c
diff options
context:
space:
mode:
authorChong Yidong2010-11-01 11:18:42 -0400
committerChong Yidong2010-11-01 11:18:42 -0400
commit91fd0b72816c99c0425ab783f6502a3e11f00956 (patch)
treeef448f802994bd3b06c612a06e1ffd93f9493c6f /src/dbusbind.c
parenta8039db123e0cdec9ce3bbc52bae6fbc8d99ca4c (diff)
downloademacs-91fd0b72816c99c0425ab783f6502a3e11f00956.tar.gz
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.
Diffstat (limited to 'src/dbusbind.c')
-rw-r--r--src/dbusbind.c12
1 files changed, 0 insertions, 12 deletions
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
1232 SDATA (interface), 1232 SDATA (interface),
1233 SDATA (method)); 1233 SDATA (method));
1234 1234
1235 /* Check dbus-registered-objects-table. */
1236 if (!HASH_TABLE_P (Vdbus_registered_objects_table))
1237 XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
1238
1239 /* Open a connection to the bus. */ 1235 /* Open a connection to the bus. */
1240 connection = xd_initialize (bus, TRUE); 1236 connection = xd_initialize (bus, TRUE);
1241 1237
@@ -1873,10 +1869,6 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
1873 wrong_type_argument (intern ("functionp"), handler); 1869 wrong_type_argument (intern ("functionp"), handler);
1874 GCPRO6 (bus, service, path, interface, signal, handler); 1870 GCPRO6 (bus, service, path, interface, signal, handler);
1875 1871
1876 /* Check dbus-registered-objects-table. */
1877 if (!HASH_TABLE_P (Vdbus_registered_objects_table))
1878 XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
1879
1880 /* Retrieve unique name of service. If service is a known name, we 1872 /* Retrieve unique name of service. If service is a known name, we
1881 will register for the corresponding unique name, if any. Signals 1873 will register for the corresponding unique name, if any. Signals
1882 are sent always with the unique name as sender. Note: the unique 1874 are sent always with the unique name as sender. Note: the unique
@@ -1989,10 +1981,6 @@ used for composing the returning D-Bus message. */)
1989 /* TODO: We must check for a valid service name, otherwise there is 1981 /* TODO: We must check for a valid service name, otherwise there is
1990 a segmentation fault. */ 1982 a segmentation fault. */
1991 1983
1992 /* Check dbus-registered-objects-table. */
1993 if (!HASH_TABLE_P (Vdbus_registered_objects_table))
1994 XD_SIGNAL1 (build_string ("dbus.el is not loaded"));
1995
1996 /* Open a connection to the bus. */ 1984 /* Open a connection to the bus. */
1997 connection = xd_initialize (bus, TRUE); 1985 connection = xd_initialize (bus, TRUE);
1998 1986