From: Enlightenment C. <no...@cv...> - 2007-07-12 02:20:52
|
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_main.c Log Message: its not guaranteed that storage devices will have UDI's beginning with 'storage', nor does it make sense to query those that do for capability 'volume'. check all devices for both capabilities =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_fm_main.c 3 Jul 2007 15:35:14 -0000 1.24 +++ e_fm_main.c 12 Jul 2007 02:20:51 -0000 1.25 @@ -278,18 +278,13 @@ while ((device = ecore_list_next(ret->strings))) { // printf("DB INIT DEV+: %s\n", device); - if (!strncmp(device, "/org/freedesktop/Hal/devices/storage", - strlen("/org/freedesktop/Hal/devices/storage"))) - { - char *udi; - int ret; - - udi = device; - ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage", - _e_dbus_cb_store_is, strdup(udi)); - e_hal_device_query_capability(_e_dbus_conn, udi, "volume", - _e_dbus_cb_vol_is, strdup(udi)); - } + char *udi; + + udi = device; + e_hal_device_query_capability(_e_dbus_conn, udi, "storage", + _e_dbus_cb_store_is, strdup(udi)); + e_hal_device_query_capability(_e_dbus_conn, udi, "volume", + _e_dbus_cb_vol_is, strdup(udi)); } } |