aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2014-02-18 08:46:38 +0100
committerMichael Albinus2014-02-18 08:46:38 +0100
commit1825653e3dd0c9f1d6361f0afc62301b68015acc (patch)
tree81e837cbf301d2d28d0d030438023a00cf6018b9 /src
parent526e126f7910e27854411a48050731d8d450c387 (diff)
downloademacs-1825653e3dd0c9f1d6361f0afc62301b68015acc.tar.gz
emacs-1825653e3dd0c9f1d6361f0afc62301b68015acc.zip
* dbusbind.c (xd_close_bus): Apply proper check on busobj.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/dbusbind.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8592eef6251..1db4d4ac375 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-02-18 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbusbind.c (xd_close_bus): Apply proper check on busobj.
4
12014-02-17 Paul Eggert <eggert@cs.ucla.edu> 52014-02-17 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 temacs --daemon fix (Bug#16599). 7 temacs --daemon fix (Bug#16599).
diff --git a/src/dbusbind.c b/src/dbusbind.c
index f6df5107db1..1c386f02c90 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -973,7 +973,7 @@ xd_get_connection_references (DBusConnection *connection)
973 return *refcount; 973 return *refcount;
974} 974}
975 975
976/* Convert a Lisp dbus object to a pointer */ 976/* Convert a Lisp D-Bus object to a pointer. */
977static DBusConnection* 977static DBusConnection*
978xd_lisp_dbus_to_dbus (Lisp_Object bus) 978xd_lisp_dbus_to_dbus (Lisp_Object bus)
979{ 979{
@@ -1095,7 +1095,7 @@ xd_close_bus (Lisp_Object bus)
1095 return; 1095 return;
1096 1096
1097 busobj = CDR_SAFE(val); 1097 busobj = CDR_SAFE(val);
1098 if (NILP (val)) { 1098 if (NILP (busobj)) {
1099 xd_registered_buses = Fdelete (val, xd_registered_buses); 1099 xd_registered_buses = Fdelete (val, xd_registered_buses);
1100 return; 1100 return;
1101 } 1101 }