[Emacs-diffs] Changes to emacs/src/dbusbind.c,v

[Magnus Henoch]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Magnus Henoch <legoscia>        08/01/03 16:35:26

Index: dbusbind.c
===================================================================
RCS file: /sources/emacs/emacs/src/dbusbind.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- dbusbind.c  3 Jan 2008 16:32:54 -0000       1.17
+++ dbusbind.c  3 Jan 2008 16:35:26 -0000       1.18
@@ -813,12 +813,8 @@
   result = Qnil;
   GCPRO1 (result);
 
-  if (!dbus_message_iter_init (reply, &iter))
+  if (dbus_message_iter_init (reply, &iter))
     {
-      UNGCPRO;
-      xsignal1 (Qdbus_error, build_string ("Cannot read reply"));
-    }
-
   /* Loop over the parameters of the D-Bus reply message.  Construct a
      Lisp list, which is returned by `dbus-call-method'.  */
   while ((dtype = dbus_message_iter_get_arg_type (&iter)) != DBUS_TYPE_INVALID)
@@ -826,6 +822,11 @@
       result = Fcons (xd_retrieve_arg (dtype, &iter), result);
       dbus_message_iter_next (&iter);
     }
+    }
+  else
+    {
+      /* No arguments: just return nil. */
+    }
 
   /* Cleanup.  */
   dbus_message_unref (dmessage);