[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100136: * dbusbind.c (Fdbus_call_method_asynchronously)

[Michael Albinus]

------------------------------------------------------------
revno: 100136
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-10-25 13:46:21 +0200
message:
  * dbusbind.c (Fdbus_call_method_asynchronously)
  (Fdbus_register_signal, Fdbus_register_method): Check, whether
  `dbus-registered-objects-table' is initialized.
  
  Must not be synchronized with the trunk.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-24 21:05:11 +0000
+++ b/src/ChangeLog     2010-10-25 11:46:21 +0000
@@ -1,3 +1,9 @@
+2010-10-25  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-24  Chong Yidong  <address@hidden>
 
        * xterm.c (x_connection_closed): Kill Emacs unconditionally.

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2010-10-08 11:40:23 +0000
+++ b/src/dbusbind.c    2010-10-25 11:46:21 +0000
@@ -1175,6 +1175,10 @@
                    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 @@
     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 @@
   /* 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);