Mercurial > emacs

diff src/dbusbind.c @ 106730:d1805c8df951

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 04 Jan 2010 12:38:20 -0500
parents d27fa5359486
children 1d1d5d9bd884
line wrap: on
line diff
--- a/src/dbusbind.c	Sun Jan 03 22:40:30 2010 -0800
+++ b/src/dbusbind.c	Mon Jan 04 12:38:20 2010 -0500
@@ -805,7 +805,7 @@
 	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 @@
   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.  */