Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_main.c
Log Message:
adjust todo - working on fm_main - can't seem to get hal to mount removable
devices with uid=X (X == the users uid) so the user can modify their
removable devices.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_fm_main.c 25 Jul 2007 17:00:50 -0000 1.26
+++ e_fm_main.c 5 Aug 2007 23:30:40 -0000 1.27
@@ -215,26 +215,26 @@
e_dbus_init();
_e_dbus_conn = e_dbus_bus_get(DBUS_BUS_SYSTEM);
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);
- }
+ {
+ 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();
@@ -709,7 +709,7 @@
static int mount_id = 1;
char buf[4096];
char *mount_point;
- Ecore_List *opt;
+ Ecore_List *opt = NULL;
if (v->mount_point && v->mount_point[0])
mount_point = v->mount_point;
@@ -730,9 +730,13 @@
printf("mount %s %s\n", v->udi, v->mount_point);
// FIXME; need to mount AS the USER - not root!!! seems it mounts as root
// opt = ecore_list_new();
-// ecore_list_append(opt, "user");
+// snprintf(buf, sizeof(buf), "uid=%i", (int)getuid());
+//// hmmm - so how do these work?
+// ecore_list_append(opt, buf);
+//// ecore_list_append(opt, "user");
+//// ecore_list_append(opt, "utf8");
e_hal_device_volume_mount(_e_dbus_conn, v->udi, v->mount_point,
- v->fstype, NULL, _e_dbus_cb_vol_mounted, v);
+ v->fstype, opt, _e_dbus_cb_vol_mounted, v);
// ecore_list_destroy(opt);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
