diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-01-04 12:38:20 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-01-04 12:38:20 -0500 |
| commit | e3eb1dae0dbedaa4623e248be0e3db8c9495df02 (patch) | |
| tree | 4e522cabd0f078a70db075ea4e922f06d4d978ba /src/dbusbind.c | |
| parent | 8e7e22861ed0543f9934dcba83f04aec5d92e6a3 (diff) | |
(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.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 59702ed93c..974a01e8ea 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -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. */ |