[Emacs-diffs] /srv/bzr/emacs/trunk r102212: Fix error in last merge from branch.

[Chong Yidong]

------------------------------------------------------------
revno: 102212
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-11-01 11:18:42 -0400
message:
  Fix error in last merge from branch.
  Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
  not intended for trunk.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-01 14:59:31 +0000
+++ b/src/ChangeLog     2010-11-01 15:18:42 +0000
@@ -78,12 +78,6 @@
        when aborting on GTK.  This requires using shut_down_emacs
        directly instead of Fkill_emacs.
 
-2010-10-31  Michael Albinus  <address@hidden>
-
-       * 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  <address@hidden>
 
        * emacs.c (main): Call syms_of_filelock unconditionally.

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2010-10-31 14:40:01 +0000
+++ b/src/dbusbind.c    2010-11-01 15:18:42 +0000
@@ -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);