forked from enlightenment/enlightenment
use eina_log for dbg messages, remove call to IdUsage which is never checked
SVN revision: 71943
This commit is contained in:
Mike Blumenkrantz
parent
71f1dffc92
commit
33562f92a1
|
|
@ -124,7 +124,7 @@ _e_fm_main_udisks_poll(void *data __UNUSED__,
|
|||
DBUS_TYPE_INVALID))
|
||||
dbus_error_free(&err);
|
||||
|
||||
//printf("name: %s\nfrom: %s\nto: %s\n", name, from, to);
|
||||
//INF("name: %s\nfrom: %s\nto: %s\n", name, from, to);
|
||||
if ((name) && !strcmp(name, E_UDISKS_BUS))
|
||||
_e_fm_main_udisks_test(NULL, NULL, NULL);
|
||||
}
|
||||
|
|
@ -178,7 +178,7 @@ _e_fm_main_udisks_cb_dev_all(void *user_data __UNUSED__,
|
|||
|
||||
EINA_LIST_FOREACH(ret->strings, l, udi)
|
||||
{
|
||||
printf("DB INIT DEV+: %s\n", udi);
|
||||
INF("DB INIT DEV+: %s\n", udi);
|
||||
e_udisks_get_property(_e_fm_main_udisks_conn, udi, "IdUsage",
|
||||
(E_DBus_Callback_Func)_e_fm_main_udisks_cb_dev_verify, (void*)eina_stringshare_add(udi));
|
||||
}
|
||||
|
|
@ -202,7 +202,7 @@ _e_fm_main_udisks_cb_dev_verify(const char *udi,
|
|||
_e_fm_main_udisks_storage_add(udi);
|
||||
else if (!strcmp(ret->val.s, "filesystem"))
|
||||
{
|
||||
printf("DB VOL+: %s\n", udi);
|
||||
INF("DB VOL+: %s\n", udi);
|
||||
_e_fm_main_udisks_volume_add(udi, EINA_TRUE);
|
||||
}
|
||||
//eina_stringshare_del(udi);
|
||||
|
|
@ -225,7 +225,7 @@ _e_fm_main_udisks_cb_dev_add_verify(const char *udi,
|
|||
_e_fm_main_udisks_storage_add(udi);
|
||||
else if (!strcmp(ret->val.s, "filesystem"))
|
||||
{
|
||||
printf("DB VOL+: %s\n", udi);
|
||||
INF("DB VOL+: %s\n", udi);
|
||||
_e_fm_main_udisks_volume_add(udi, EINA_FALSE);
|
||||
}
|
||||
//eina_stringshare_del(udi);
|
||||
|
|
@ -258,7 +258,7 @@ _e_fm_main_udisks_cb_dev_del(void *data __UNUSED__,
|
|||
dbus_message_get_args(msg,
|
||||
&err, DBUS_TYPE_OBJECT_PATH,
|
||||
&udi, DBUS_TYPE_INVALID);
|
||||
printf("DB DEV-: %s\n", udi);
|
||||
INF("DB DEV-: %s\n", udi);
|
||||
if ((v = _e_fm_main_udisks_volume_find(udi)))
|
||||
{
|
||||
if (v->optype == E_VOLUME_OP_TYPE_EJECT)
|
||||
|
|
@ -281,7 +281,7 @@ _e_fm_main_udisks_cb_dev_chg(void *data __UNUSED__,
|
|||
DBUS_TYPE_OBJECT_PATH, &udi,
|
||||
DBUS_TYPE_INVALID);
|
||||
|
||||
printf("DB STORE CAP+: %s\n", udi);
|
||||
INF("DB STORE CAP+: %s\n", udi);
|
||||
e_udisks_get_property(_e_fm_main_udisks_conn, udi, "IdUsage",
|
||||
(E_DBus_Callback_Func)_e_fm_main_udisks_cb_dev_add_verify, (void*)eina_stringshare_add(udi));
|
||||
}
|
||||
|
|
@ -294,7 +294,7 @@ _e_fm_main_udisks_cb_prop_modified(E_Volume *v,
|
|||
|
||||
if (dbus_message_get_error_name(msg))
|
||||
{
|
||||
printf("DBUS ERROR: %s\n", dbus_message_get_error_name(msg));
|
||||
ERR("DBUS ERROR: %s\n", dbus_message_get_error_name(msg));
|
||||
return;
|
||||
}
|
||||
e_udisks_get_all_properties(_e_fm_main_udisks_conn, v->udi,
|
||||
|
|
@ -306,7 +306,7 @@ _e_fm_main_udisks_cb_store_prop(E_Storage *s,
|
|||
E_Ukit_Properties *ret,
|
||||
DBusError *error)
|
||||
{
|
||||
const char *str;
|
||||
//const char *str;
|
||||
int err = 0;
|
||||
|
||||
if (!ret) goto error;
|
||||
|
|
@ -335,13 +335,13 @@ _e_fm_main_udisks_cb_store_prop(E_Storage *s,
|
|||
s->vendor = eina_stringshare_add(s->vendor);
|
||||
s->serial = e_ukit_property_string_get(ret, "DriveSerial", &err);
|
||||
// if (err) goto error;
|
||||
if (err) printf("Error getting serial for %s\n", s->udi);
|
||||
if (err) ERR("Error getting serial for %s\n", s->udi);
|
||||
s->serial = eina_stringshare_add(s->serial);
|
||||
|
||||
s->removable = e_ukit_property_bool_get(ret, "DeviceIsRemovable", &err);
|
||||
s->system_internal = e_ukit_property_bool_get(ret, "DeviceIsSystemInternal", &err);
|
||||
if (s->system_internal) goto error; /* only track non internal */
|
||||
str = e_ukit_property_string_get(ret, "IdUsage", &err);
|
||||
//str = e_ukit_property_string_get(ret, "IdUsage", &err);
|
||||
/* if not of filesystem usage type - skip it - testing on ubuntu 10.04 */
|
||||
//if (!((str) && (!strcmp(str, "filesystem")))) goto error;
|
||||
/* force it to be removable if it passed the above tests */
|
||||
|
|
@ -364,7 +364,7 @@ _e_fm_main_udisks_cb_store_prop(E_Storage *s,
|
|||
if (s->icon.volume && s->icon.volume[0]) s->icon.volume = eina_stringshare_add(s->icon.volume);
|
||||
else s->icon.volume = NULL;
|
||||
|
||||
// printf("++STO:\n udi: %s\n bus: %s\n drive_type: %s\n model: %s\n vendor: %s\n serial: %s\n icon.drive: %s\n icon.volume: %s\n\n", s->udi, s->bus, s->drive_type, s->model, s->vendor, s->serial, s->icon.drive, s->icon.volume);
|
||||
// INF("++STO:\n udi: %s\n bus: %s\n drive_type: %s\n model: %s\n vendor: %s\n serial: %s\n icon.drive: %s\n icon.volume: %s\n\n", s->udi, s->bus, s->drive_type, s->model, s->vendor, s->serial, s->icon.drive, s->icon.volume);
|
||||
s->validated = EINA_TRUE;
|
||||
{
|
||||
void *msg_data;
|
||||
|
|
@ -383,7 +383,7 @@ _e_fm_main_udisks_cb_store_prop(E_Storage *s,
|
|||
return;
|
||||
|
||||
error:
|
||||
// printf("ERR %s\n", s->udi);
|
||||
// ERR("ERR %s\n", s->udi);
|
||||
_e_fm_main_udisks_storage_del(s->udi);
|
||||
}
|
||||
|
||||
|
|
@ -624,7 +624,7 @@ _e_fm_main_udisks_cb_vol_mounted(E_Volume *v,
|
|||
v->optype = E_VOLUME_OP_TYPE_NONE;
|
||||
v->op = NULL;
|
||||
v->mounted = EINA_TRUE;
|
||||
// printf("MOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||
// INF("MOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
||||
buf = alloca(size);
|
||||
strcpy(buf, v->udi);
|
||||
|
|
@ -685,7 +685,7 @@ _e_fm_main_udisks_cb_vol_unmounted(E_Volume *v,
|
|||
}
|
||||
|
||||
v->mounted = EINA_FALSE;
|
||||
// printf("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||
// INF("UNMOUNT: %s from %s\n", v->udi, v->mount_point);
|
||||
size = strlen(v->udi) + 1 + strlen(v->mount_point) + 1;
|
||||
buf = alloca(size);
|
||||
strcpy(buf, v->udi);
|
||||
|
|
@ -786,7 +786,7 @@ _e_fm_main_udisks_volume_add(const char *udi,
|
|||
if (e_volume_find(udi)) return NULL;
|
||||
v = calloc(1, sizeof(E_Volume));
|
||||
if (!v) return NULL;
|
||||
// printf("VOL+ %s\n", udi);
|
||||
// INF("VOL+ %s\n", udi);
|
||||
v->efm_mode = EFM_MODE_USING_UDISKS_MOUNT;
|
||||
v->udi = eina_stringshare_add(udi);
|
||||
v->icon = NULL;
|
||||
|
|
@ -820,7 +820,7 @@ _e_fm_main_udisks_volume_del(const char *udi)
|
|||
if (v->prop_handler) e_dbus_signal_handler_del(_e_fm_main_udisks_conn, v->prop_handler);
|
||||
if (v->validated)
|
||||
{
|
||||
// printf("--VOL %s\n", v->udi);
|
||||
// INF("--VOL %s\n", v->udi);
|
||||
/* FIXME: send event of storage volume (disk) removed */
|
||||
ecore_ipc_server_send(_e_fm_ipc_server,
|
||||
6 /*E_IPC_DOMAIN_FM*/,
|
||||
|
|
@ -866,8 +866,8 @@ _e_fm_main_udisks_volume_eject(E_Volume *v)
|
|||
void
|
||||
_e_fm_main_udisks_volume_unmount(E_Volume *v)
|
||||
{
|
||||
// printf("unmount %s %s\n", v->udi, v->mount_point);
|
||||
if (!v || v->guard) return;
|
||||
// INF("unmount %s %s\n", v->udi, v->mount_point);
|
||||
|
||||
v->guard = ecore_timer_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_udisks_vol_unmount_timeout, v);
|
||||
v->op = e_udisks_volume_unmount(_e_fm_main_udisks_conn, v->udi, NULL);
|
||||
|
|
@ -884,7 +884,7 @@ _e_fm_main_udisks_volume_mount(E_Volume *v)
|
|||
if ((!v) || (v->guard))
|
||||
return;
|
||||
|
||||
// printf("mount %s %s [fs type = %s]\n", v->udi, v->mount_point, v->fstype);
|
||||
// INF("mount %s %s [fs type = %s]\n", v->udi, v->mount_point, v->fstype);
|
||||
|
||||
// for vfat and ntfs we want the uid mapped to the user mounting, if we can
|
||||
if ((!strcmp(v->fstype, "vfat")) ||
|
||||
|
|
@ -982,7 +982,7 @@ _e_fm_main_udisks_storage_del(const char *udi)
|
|||
if (!s) return;
|
||||
if (s->validated)
|
||||
{
|
||||
// printf("--STO %s\n", s->udi);
|
||||
// INF("--STO %s\n", s->udi);
|
||||
ecore_ipc_server_send(_e_fm_ipc_server,
|
||||
6 /*E_IPC_DOMAIN_FM*/,
|
||||
E_FM_OP_STORAGE_DEL,
|
||||
|
|
|
|||
Loading…
Reference in New Issue