aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dbusbind.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 36f86556944..54130be685c 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -211,7 +211,7 @@ xd_dbus_type_to_symbol (int type)
211 211
212/* Check whether a Lisp symbol is a predefined D-Bus type symbol. */ 212/* Check whether a Lisp symbol is a predefined D-Bus type symbol. */
213#define XD_DBUS_TYPE_P(object) \ 213#define XD_DBUS_TYPE_P(object) \
214 Fkeywordp (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID)) 214 SYMBOLP (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID))
215 215
216/* Determine the DBusType of a given Lisp OBJECT. It is used to 216/* Determine the DBusType of a given Lisp OBJECT. It is used to
217 convert Lisp objects, being arguments of `dbus-call-method' or 217 convert Lisp objects, being arguments of `dbus-call-method' or
@@ -1231,7 +1231,7 @@ this connection to those buses. */)
1231 xd_add_watch, 1231 xd_add_watch,
1232 xd_remove_watch, 1232 xd_remove_watch,
1233 xd_toggle_watch, 1233 xd_toggle_watch,
1234 Fkeywordp (bus) 1234 SYMBOLP (bus)
1235 ? (void *) XSYMBOL (bus) 1235 ? (void *) XSYMBOL (bus)
1236 : (void *) XSTRING (bus), 1236 : (void *) XSTRING (bus),
1237 NULL)) 1237 NULL))
@@ -1797,7 +1797,7 @@ xd_read_queued_messages (int fd, void *data)
1797 while (!NILP (busp)) 1797 while (!NILP (busp))
1798 { 1798 {
1799 key = CAR_SAFE (CAR_SAFE (busp)); 1799 key = CAR_SAFE (CAR_SAFE (busp));
1800 if ((Fkeywordp (key) && XSYMBOL (key) == data) 1800 if ((SYMBOLP (key) && XSYMBOL (key) == data)
1801 || (STRINGP (key) && XSTRING (key) == data)) 1801 || (STRINGP (key) && XSTRING (key) == data))
1802 bus = key; 1802 bus = key;
1803 busp = CDR_SAFE (busp); 1803 busp = CDR_SAFE (busp);