Enlightenment CVS committal
Author : kiwi
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_main.c
Log Message:
fix potential segfaults if dbus is not working
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_fm_main.c 17 Jun 2007 04:00:53 -0000 1.23
+++ e_fm_main.c 3 Jul 2007 15:35:14 -0000 1.24
@@ -214,25 +214,27 @@
_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();
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
