Mercurial > emacs

changeset 109371:bf0e558ade02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* dbusbind.c (xd_initialize): Don't compare boolean with a constant.
author Andreas Schwab <schwab@linux-m68k.org>
date Mon, 12 Jul 2010 21:03:53 +0200
parents a0caeaa02476
children dd04c65fb401
files src/ChangeLog src/dbusbind.c
diffstat 2 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jul 12 21:44:35 2010 +0300
+++ b/src/ChangeLog	Mon Jul 12 21:03:53 2010 +0200
@@ -1,3 +1,8 @@
+2010-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* dbusbind.c (xd_initialize): Don't compare boolean with a
+	constant.
+
 2010-07-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* process.c (setup_process_coding_systems): Move to the part
--- a/src/dbusbind.c	Mon Jul 12 21:44:35 2010 +0300
+++ b/src/dbusbind.c	Mon Jul 12 21:03:53 2010 +0200
@@ -714,9 +714,9 @@
 }
 
 /* Initialize D-Bus connection.  BUS is a Lisp symbol, either :system
-   or :session.  It tells which D-Bus to be initialized.  RAISE_ERROR
-   can be TRUE or FALSE, it controls whether an error is signalled in
-   case the connection cannot be initialized.  */
+   or :session.  It tells which D-Bus to initialize.  If RAISE_ERROR
+   is non-zero signal an error when the connection cannot be
+   initialized.  */
 static DBusConnection *
 xd_initialize (Lisp_Object bus, int raise_error)
 {
@@ -726,7 +726,7 @@
   /* Parameter check.  */
   CHECK_SYMBOL (bus);
   if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus)))
-    if (raise_error == TRUE)
+    if (raise_error)
       XD_SIGNAL2 (build_string ("Wrong bus name"), bus);
     else
       return NULL;
@@ -734,7 +734,7 @@
   /* We do not want to have an autolaunch for the session bus.  */
   if (EQ (bus, QCdbus_session_bus)
       && getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL)
-    if (raise_error == TRUE)
+    if (raise_error)
       XD_SIGNAL2 (build_string ("No connection to bus"), bus);
     else
       return NULL;
@@ -748,12 +748,12 @@
     connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);
 
   if (dbus_error_is_set (&derror))
-    if (raise_error == TRUE)
+    if (raise_error)
       XD_ERROR (derror);
     else
       connection = NULL;
 
-  if ((connection == NULL) && (raise_error == TRUE))
+  if (connection == NULL && raise_error)
     XD_SIGNAL2 (build_string ("No connection to bus"), bus);
 
   /* Cleanup.  */