# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1288624722 14400
# Node ID cf216ba9dc87dfa94c481b2e4fa09dc56f5af003
# Parent  8ddff723bc6f0ea2372435a70dd9d159909984ba
Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.

diff -r 8ddff723bc6f -r cf216ba9dc87 src/ChangeLog
--- a/src/ChangeLog	Mon Nov 01 15:59:31 2010 +0100
+++ b/src/ChangeLog	Mon Nov 01 11:18:42 2010 -0400
@@ -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 -r 8ddff723bc6f -r cf216ba9dc87 src/dbusbind.c
--- a/src/dbusbind.c	Mon Nov 01 15:59:31 2010 +0100
+++ b/src/dbusbind.c	Mon Nov 01 11:18:42 2010 -0400
@@ -1232,10 +1232,6 @@
 		    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 @@
     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 @@
   /* 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);