[Emacs-diffs] emacs-24 r117116: * net/dbus.el (dbus-init-bus, dbus-call-method)

[Michael Albinus]

------------------------------------------------------------
revno: 117116
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17508
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-05-16 15:11:09 +0200
message:
  * net/dbus.el (dbus-init-bus, dbus-call-method)
  (dbus-call-method-asynchronously, dbus-send-signal)
  (dbus-method-return-internal, dbus-method-error-internal)
  Check, whether Emacs has been compiled with D-Bus support.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/dbus.el               dbus.el-20091113204419-o5vbwnq5f7feedwu-7962

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-14 20:41:53 +0000
+++ b/lisp/ChangeLog    2014-05-16 13:11:09 +0000
@@ -1,3 +1,10 @@
+2014-05-16  Michael Albinus  <address@hidden>
+
+       * net/dbus.el (dbus-init-bus, dbus-call-method)
+       (dbus-call-method-asynchronously, dbus-send-signal)
+       (dbus-method-return-internal, dbus-method-error-internal)
+       Check, whether Emacs has been compiled with D-Bus support.  (Bug#17508)
+
 2014-05-14  Nicolas Richard  <address@hidden>
 
        * emacs-lisp/eieio-opt.el (eieio-help-class): Correctly deal with

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2014-02-27 15:41:13 +0000
+++ b/lisp/net/dbus.el  2014-05-16 13:11:09 +0000
@@ -277,6 +277,8 @@
 
   => \"i686\""
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -380,6 +382,8 @@
 
   -| i686"
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -428,6 +432,8 @@
   :session nil \"/org/gnu/Emacs\" \"org.gnu.Emacs.FileManager\"
   \"FileModified\" \"/home/albinus/.emacs\")"
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (null service) (stringp service)
@@ -446,6 +452,8 @@
   "Return for message SERIAL on the D-Bus BUS.
 This is an internal function, it shall not be used outside dbus.el."
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -460,6 +468,8 @@
   "Return error message for message SERIAL on the D-Bus BUS.
 This is an internal function, it shall not be used outside dbus.el."
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -1763,6 +1773,8 @@
 GTK+.  It should be used with care for at least the `:system' and
 `:session' buses, because other Emacs Lisp packages might already use
 this connection to those buses."
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (dbus--init-bus bus private)
   (dbus-register-signal
    bus nil dbus-path-local dbus-interface-local