correctly init e_hal here only when it is used as the device backend
SVN revision: 55834
This commit is contained in:
parent
630af48700
commit
1d16b37f4e
|
@ -302,6 +302,8 @@ else
|
|||
fi
|
||||
AC_MSG_RESULT($device_backend)
|
||||
AM_CONDITIONAL([HAVE_EEZE], [test "x${device_backend}" = "xeeze"])
|
||||
test "x${device_backend}" = "xeeze" || AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable HAL support])
|
||||
|
||||
|
||||
DBUS_MOUNT_CONFIG=1
|
||||
dbus_mount="dbus-1"
|
||||
|
|
|
@ -30,9 +30,7 @@ e_msgbus_init(void)
|
|||
_e_msgbus_data = E_NEW(E_Msgbus_Data, 1);
|
||||
|
||||
e_dbus_init();
|
||||
#ifdef HAVE_EUKIT
|
||||
e_ukit_init();
|
||||
#else
|
||||
#ifdef HAVE_HAL
|
||||
e_hal_init();
|
||||
#endif
|
||||
|
||||
|
@ -104,9 +102,7 @@ e_msgbus_shutdown(void)
|
|||
{
|
||||
e_dbus_connection_close(_e_msgbus_data->conn);
|
||||
}
|
||||
#ifdef HAVE_EUKIT
|
||||
e_ukit_shutdown();
|
||||
#else
|
||||
#ifdef HAVE_HAL
|
||||
e_hal_shutdown();
|
||||
#endif
|
||||
e_dbus_shutdown();
|
||||
|
|
Loading…
Reference in New Issue