forked from enlightenment/enlightenment
fix potential segfaults if dbus is not working
SVN revision: 30575
This commit is contained in:
parent
88bb37a1cb
commit
5e8a55ff99
|
@ -214,25 +214,27 @@ main(int argc, char **argv)
|
|||
_e_storage_volume_edd_init();
|
||||
e_dbus_init();
|
||||
_e_dbus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
|
||||
|
||||
e_hal_manager_get_all_devices(_e_dbus_conn, _e_dbus_cb_dev_all, NULL);
|
||||
e_hal_manager_find_device_by_capability(_e_dbus_conn, "storage",
|
||||
_e_dbus_cb_dev_store, NULL);
|
||||
e_hal_manager_find_device_by_capability(_e_dbus_conn, "volume",
|
||||
_e_dbus_cb_dev_vol, NULL);
|
||||
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"DeviceAdded", _e_dbus_cb_dev_add, NULL);
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"DeviceRemoved", _e_dbus_cb_dev_del, NULL);
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"NewCapability", _e_dbus_cb_cap_add, NULL);
|
||||
if (_e_dbus_conn)
|
||||
{
|
||||
e_hal_manager_get_all_devices(_e_dbus_conn, _e_dbus_cb_dev_all, NULL);
|
||||
e_hal_manager_find_device_by_capability(_e_dbus_conn, "storage",
|
||||
_e_dbus_cb_dev_store, NULL);
|
||||
e_hal_manager_find_device_by_capability(_e_dbus_conn, "volume",
|
||||
_e_dbus_cb_dev_vol, NULL);
|
||||
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"DeviceAdded", _e_dbus_cb_dev_add, NULL);
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"DeviceRemoved", _e_dbus_cb_dev_del, NULL);
|
||||
e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal",
|
||||
"/org/freedesktop/Hal/Manager",
|
||||
"org.freedesktop.Hal.Manager",
|
||||
"NewCapability", _e_dbus_cb_cap_add, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (_e_ipc_init()) ecore_main_loop_begin();
|
||||
|
|
Loading…
Reference in New Issue