Commit e3eb1dae authored by Stefan Monnier's avatar Stefan Monnier

(xd_remove_watch): Avoid trying to convert a void* to

Lisp_Object, preferring to convert a lisp_Object to a void* instead.
(Fdbus_init_bus): Use XHASH to get a scalar value from a Lisp_Object.
parent 8e7e2286
2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
* dbusbind.c (xd_remove_watch): Avoid trying to convert a void* to
Lisp_Object, preferring to convert a lisp_Object to a void* instead.
(Fdbus_init_bus): Use XHASH to get a scalar value from a Lisp_Object.
2010-01-03 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_add_watch): Improve debug message.
......@@ -21221,7 +21227,7 @@ See ChangeLog.10 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
......
......@@ -805,7 +805,7 @@ xd_remove_watch (watch, data)
return;
/* Unset session environment. */
if ((data != NULL) && (EQ ((Lisp_Object) data, QCdbus_session_bus)))
if ((data != NULL) && (data == (void*) XHASH (QCdbus_session_bus)))
{
XD_DEBUG_MESSAGE ("unsetenv DBUS_SESSION_BUS_ADDRESS");
unsetenv ("DBUS_SESSION_BUS_ADDRESS");
......@@ -838,7 +838,7 @@ This is an internal function, it shall not be used outside dbus.el. */)
if (!dbus_connection_set_watch_functions (connection,
xd_add_watch,
xd_remove_watch,
NULL, (void *) bus, NULL))
NULL, (void*) XHASH (bus), NULL))
XD_SIGNAL1 (build_string ("Cannot add watch functions"));
/* Return. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment