diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 46fcd98fb..377e3f0b5 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -259,6 +259,7 @@ struct _E_Config int device_desktop; // GUI int device_auto_mount; // GUI int device_auto_open; // GUI + Efm_Mode device_detect_mode; /* not saved, display-only */ struct { diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 7c5288f01..4be4064c1 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -2828,6 +2828,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) v = _e_fm_shared_codec_volume_decode(e->data, e->size); if (v) { + e_config->device_detect_mode = v->efm_mode; e_fm2_device_volume_add(v); if (e_config->device_auto_mount && !v->mounted && !v->first_time) _e_fm2_client_mount(v->udi, v->mount_point); diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 594fe9bb8..08befd421 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -278,11 +278,27 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, e_widget_toolbook_page_append(otb, NULL, _("Behavior"), o, 0, 0, 0, 0, 0.5, 0.0); o = e_widget_list_add(evas, 2, 0); -#ifdef HAVE_EUKIT - ob = e_widget_check_add(evas, _("Show UDisks icons on desktop"), -#else + { + char buf[32]; + switch (e_config->device_detect_mode) + { + case EFM_MODE_USING_HAL_MOUNT: + snprintf(buf, sizeof(buf), "%s: HAL", _("Mode")); + break; + case EFM_MODE_USING_UDISKS_MOUNT: + snprintf(buf, sizeof(buf), "%s: UDISKS", _("Mode")); + break; + case EFM_MODE_USING_EEZE_MOUNT: + snprintf(buf, sizeof(buf), "%s: EEZE", _("Mode")); + break; + default: + snprintf(buf, sizeof(buf), "%s: RASTER", _("Mode")); + break; + } + ob = e_widget_label_add(evas, buf); + e_widget_list_object_append(o, ob, 0, 1, 0.5); + } ob = e_widget_check_add(evas, _("Show device icons on desktop"), -#endif &(cfdata->dbus.desktop)); e_widget_list_object_append(o, ob, 1, 1, 0.5); ob = e_widget_check_add(evas, _("Mount volumes on insert"),