comparison src/dbusbind.c @ 109371:bf0e558ade02

* dbusbind.c (xd_initialize): Don't compare boolean with a constant.

109370:a0caeaa02476

      return Qnil;
    }
}

/* 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.  */
static DBusConnection *
xd_initialize (Lisp_Object bus, int raise_error)
{
  DBusConnection *connection;
  DBusError derror;

  /* Parameter check.  */
  CHECK_SYMBOL (bus);
  if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus)))
    if (raise_error == TRUE)
      XD_SIGNAL2 (build_string ("Wrong bus name"), bus);
    else
      return NULL;

  /* 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)
      XD_SIGNAL2 (build_string ("No connection to bus"), bus);
    else
      return NULL;

  /* Open a connection to the bus.  */

    connection = dbus_bus_get (DBUS_BUS_SYSTEM, &derror);
  else
    connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);

  if (dbus_error_is_set (&derror))
    if (raise_error == TRUE)
      XD_ERROR (derror);
    else
      connection = NULL;

  if ((connection == NULL) && (raise_error == TRUE))
    XD_SIGNAL2 (build_string ("No connection to bus"), bus);

  /* Cleanup.  */
  dbus_error_free (&derror);

109371:bf0e558ade02

      return Qnil;
    }
}

/* Initialize D-Bus connection.  BUS is a Lisp symbol, either :system
   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)
{
  DBusConnection *connection;
  DBusError derror;

  /* Parameter check.  */
  CHECK_SYMBOL (bus);
  if (!(EQ (bus, QCdbus_system_bus) || EQ (bus, QCdbus_session_bus)))
    if (raise_error)
      XD_SIGNAL2 (build_string ("Wrong bus name"), bus);
    else
      return NULL;

  /* 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)
      XD_SIGNAL2 (build_string ("No connection to bus"), bus);
    else
      return NULL;

  /* Open a connection to the bus.  */

    connection = dbus_bus_get (DBUS_BUS_SYSTEM, &derror);
  else
    connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);

  if (dbus_error_is_set (&derror))
    if (raise_error)
      XD_ERROR (derror);
    else
      connection = NULL;

  if (connection == NULL && raise_error)
    XD_SIGNAL2 (build_string ("No connection to bus"), bus);

  /* Cleanup.  */
  dbus_error_free (&derror);