From 9d40d66091f2807c109fb81d06cbb05bc03a072e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 30 Apr 2010 19:14:20 +0000 Subject: [PATCH] step 3: migrate all function and variable names to generic dbus naming SVN revision: 48488 --- src/bin/e_config.c | 6 +-- src/bin/e_config.h | 6 +-- src/bin/e_fm.c | 74 +++++++++++++------------- src/bin/e_fm_dbus.c | 84 +++++++++++++++--------------- src/bin/e_fm_dbus.h | 38 +++++++------- src/bin/e_fm_main.c | 22 ++++---- src/modules/fileman/e_mod_config.c | 36 +++++++------ src/modules/fileman/e_mod_main.c | 2 +- 8 files changed, 136 insertions(+), 132 deletions(-) diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 99d19b132..d82c5741f 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -696,9 +696,9 @@ e_config_init(void) E_CONFIG_VAL(D, T, thumbscroll_momentum_threshhold, DOUBLE); E_CONFIG_VAL(D, T, thumbscroll_friction, DOUBLE); - E_CONFIG_VAL(D, T, hal_desktop, INT); - E_CONFIG_VAL(D, T, hal_auto_mount, INT); - E_CONFIG_VAL(D, T, hal_auto_open, INT); + E_CONFIG_VAL(D, T, dbus_desktop, INT); + E_CONFIG_VAL(D, T, dbus_auto_mount, INT); + E_CONFIG_VAL(D, T, dbus_auto_open, INT); E_CONFIG_VAL(D, T, border_keyboard.timeout, DOUBLE); E_CONFIG_VAL(D, T, border_keyboard.move.dx, UCHAR); diff --git a/src/bin/e_config.h b/src/bin/e_config.h index 222dfe3af..4cf3daba3 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -288,9 +288,9 @@ struct _E_Config double thumbscroll_momentum_threshhold; // GUI double thumbscroll_friction; // GUI - int hal_desktop; - int hal_auto_mount; - int hal_auto_open; + int dbus_desktop; + int dbus_auto_mount; + int dbus_auto_open; struct { double timeout; diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index ba7a12a75..7b51bf07e 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -359,7 +359,7 @@ static void _e_fm_error_abort_cb(void *data, E_Dialog *dialog); static void _e_fm_error_ignore_this_cb(void *data, E_Dialog *dialog); static void _e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog); -static void _e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr); +static void _e_fm_dbus_error_dialog(const char *title, const char *msg, const char *pstr); static void _e_fm2_file_delete(Evas_Object *obj); static void _e_fm2_file_delete_menu(void *data, E_Menu *m, E_Menu_Item *mi); @@ -832,7 +832,7 @@ _e_fm2_cb_mount_fail(void *data) if (!sd) return; // safety if (sd->mount) { - // At this moment E_Fm2_Mount object already deleted in e_fm_hal.c + // At this moment E_Fm2_Mount object already deleted in e_fm_dbus.c sd->mount = NULL; if (sd->config->view.open_dirs_in_place) e_fm2_path_set(data, "favorites", "/"); @@ -972,7 +972,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) && strncmp(sd->mount->mount_point, sd->realpath, strlen(sd->mount->mount_point))) { - e_fm2_hal_unmount(sd->mount); + e_fm2_dbus_unmount(sd->mount); sd->mount = NULL; } @@ -981,18 +981,18 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) { E_Volume *v = NULL; - v = e_fm2_hal_volume_find(sd->dev + strlen("removable:")); + v = e_fm2_dbus_volume_find(sd->dev + strlen("removable:")); if (v) - sd->mount = e_fm2_hal_mount(v, + sd->mount = e_fm2_dbus_mount(v, _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail, _e_fm2_cb_unmount_ok, NULL, obj); } else if (sd->config->view.open_dirs_in_place == 0) { E_Fm2_Mount *m; - m = e_fm2_hal_mount_find(sd->realpath); + m = e_fm2_dbus_mount_find(sd->realpath); if (m) - sd->mount = e_fm2_hal_mount(m->volume, + sd->mount = e_fm2_dbus_mount(m->volume, _e_fm2_cb_mount_ok, _e_fm2_cb_mount_fail, _e_fm2_cb_unmount_ok, NULL, obj); } @@ -2905,7 +2905,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) E_Storage *s; s = eet_data_descriptor_decode(_e_storage_edd, e->data, e->size); - if (s) e_fm2_hal_storage_add(s); + if (s) e_fm2_dbus_storage_add(s); } break; @@ -2916,8 +2916,8 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) E_Storage *s; udi = e->data; - s = e_fm2_hal_storage_find(udi); - if (s) e_fm2_hal_storage_del(s); + s = e_fm2_dbus_storage_find(udi); + if (s) e_fm2_dbus_storage_del(s); } break; @@ -2929,8 +2929,8 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) v = eet_data_descriptor_decode(_e_volume_edd, e->data, e->size); if (v) { - e_fm2_hal_volume_add(v); - if (e_config->hal_auto_mount && !v->mounted && !v->first_time) + e_fm2_dbus_volume_add(v); + if (e_config->dbus_auto_mount && !v->mounted && !v->first_time) _e_fm2_client_mount(v->udi, v->mount_point); v->first_time = 0; } @@ -2944,8 +2944,8 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) E_Volume *v; udi = e->data; - v = e_fm2_hal_volume_find(udi); - if (v) e_fm2_hal_volume_del(v); + v = e_fm2_dbus_volume_find(udi); + if (v) e_fm2_dbus_volume_del(v); } break; @@ -2957,12 +2957,12 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) udi = e->data; mountpoint = udi + strlen(udi) + 1; - v = e_fm2_hal_volume_find(udi); + v = e_fm2_dbus_volume_find(udi); if (v) { - e_fm2_hal_mount_add(v, mountpoint); + e_fm2_dbus_mount_add(v, mountpoint); _e_fm2_volume_icon_update(v); - if (e_config->hal_auto_open && !eina_list_count(v->mounts)) + if (e_config->dbus_auto_open && !eina_list_count(v->mounts)) { E_Action *a; Eina_List *m; @@ -2983,10 +2983,10 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) char *udi; udi = e->data; - v = e_fm2_hal_volume_find(udi); + v = e_fm2_dbus_volume_find(udi); if (v) { - e_fm2_hal_mount_del(v); + e_fm2_dbus_mount_del(v); _e_fm2_volume_icon_update(v); } } @@ -3002,11 +3002,11 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) char *udi; udi = e->data; - v = e_fm2_hal_volume_find(udi); + v = e_fm2_dbus_volume_find(udi); if (v) { - _e_fm_hal_error_dialog(_("Mount Error"), _("Can't mount device"), e->data); - e_fm2_hal_mount_fail(v); + _e_fm_dbus_error_dialog(_("Mount Error"), _("Can't mount device"), e->data); + e_fm2_dbus_mount_fail(v); } } break; @@ -3018,11 +3018,11 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) char *udi; udi = e->data; - v = e_fm2_hal_volume_find(udi); + v = e_fm2_dbus_volume_find(udi); if (v) { - _e_fm_hal_error_dialog(_("Unmount Error"), _("Can't unmount device"), e->data); - e_fm2_hal_unmount_fail(v); + _e_fm_dbus_error_dialog(_("Unmount Error"), _("Can't unmount device"), e->data); + e_fm2_dbus_unmount_fail(v); } } break; @@ -3034,9 +3034,9 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) char *udi; udi = e->data; - v = e_fm2_hal_volume_find(udi); + v = e_fm2_dbus_volume_find(udi); if (v) - _e_fm_hal_error_dialog(_("Eject Error"), _("Can't eject device"), e->data); + _e_fm_dbus_error_dialog(_("Eject Error"), _("Can't eject device"), e->data); } break; @@ -3212,11 +3212,11 @@ _e_fm2_dev_path_map(const char *dev, const char *path) { E_Volume *v; - v = e_fm2_hal_volume_find(dev + strlen("removable:")); + v = e_fm2_dbus_volume_find(dev + strlen("removable:")); if (v) { if (!v->mount_point) - v->mount_point = e_fm2_hal_volume_mountpoint_get(v);; + v->mount_point = e_fm2_dbus_volume_mountpoint_get(v);; if (PRT("%s/%s", v->mount_point, path) >= sizeof(buf)) return NULL; } @@ -4908,8 +4908,8 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic) else if (!strcmp(type, "Removable")) { ic->info.removable = 1; - if ((!e_fm2_hal_storage_find(ic->info.link)) && - (!e_fm2_hal_volume_find(ic->info.link))) + if ((!e_fm2_dbus_storage_find(ic->info.link)) && + (!e_fm2_dbus_volume_find(ic->info.link))) { _e_fm2_live_file_del(ic->sd->obj, ic->info.file); efreet_desktop_free(desktop); @@ -7529,7 +7529,7 @@ _e_fm2_smart_del(Evas_Object *obj) sd->dev = sd->path = sd->realpath = NULL; if (sd->mount) { - e_fm2_hal_unmount(sd->mount); + e_fm2_dbus_unmount(sd->mount); sd->mount = NULL; } if (sd->config) _e_fm2_config_free(sd->config); @@ -8045,7 +8045,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp) { E_Volume *v; - v = e_fm2_hal_volume_find(ic->info.link); + v = e_fm2_dbus_volume_find(ic->info.link); if (v) { mi = e_menu_item_new(mn); @@ -9147,7 +9147,7 @@ _e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog) } static void -_e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr) +_e_fm_dbus_error_dialog(const char *title, const char *msg, const char *pstr) { E_Manager *man; E_Container *con; @@ -9160,7 +9160,7 @@ _e_fm_hal_error_dialog(const char *title, const char *msg, const char *pstr) con = e_container_current_get(man); if (!con) return; - dialog = e_dialog_new(con, "E", "_fm_hal_error_dialog"); + dialog = e_dialog_new(con, "E", "_fm_dbus_error_dialog"); e_dialog_title_set(dialog, title); e_dialog_icon_set(dialog, "drive-harddisk", 64); e_dialog_button_add(dialog, _("OK"), NULL, NULL, NULL); @@ -9697,7 +9697,7 @@ _e_fm2_volume_mount(void *data, E_Menu *m, E_Menu_Item *mi) v = data; if (!v) return; - mp = e_fm2_hal_volume_mountpoint_get(v); + mp = e_fm2_dbus_volume_mountpoint_get(v); _e_fm2_client_mount(v->udi, mp); eina_stringshare_del(mp); } @@ -9782,7 +9782,7 @@ _e_fm2_icon_removable_update(E_Fm2_Icon *ic) E_Volume *v; if (!ic) return; - v = e_fm2_hal_volume_find(ic->info.link); + v = e_fm2_dbus_volume_find(ic->info.link); _update_volume_icon(v, ic); } diff --git a/src/bin/e_fm_dbus.c b/src/bin/e_fm_dbus.c index 5a186f134..52580ceea 100644 --- a/src/bin/e_fm_dbus.c +++ b/src/bin/e_fm_dbus.c @@ -9,19 +9,19 @@ static void _e_fm2_volume_write(E_Volume *v) EINA_ARG_NONNULL(1); static void _e_fm2_volume_erase(E_Volume *v) EINA_ARG_NONNULL(1); -static void _e_fm2_hal_mount_free(E_Fm2_Mount *m); EINA_ARG_NONNULL(1); -static void _e_fm2_hal_mount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); -static void _e_fm2_hal_mount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); -static void _e_fm2_hal_unmount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); -static void _e_fm2_hal_unmount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); +static void _e_fm2_dbus_mount_free(E_Fm2_Mount *m); EINA_ARG_NONNULL(1); +static void _e_fm2_dbus_mount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); +static void _e_fm2_dbus_mount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); +static void _e_fm2_dbus_unmount_ok(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); +static void _e_fm2_dbus_unmount_fail(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); static Eina_List *_e_stores = NULL; static Eina_List *_e_vols = NULL; EAPI void -e_fm2_hal_storage_add(E_Storage *s) +e_fm2_dbus_storage_add(E_Storage *s) { - if (e_fm2_hal_storage_find(s->udi)) return; + if (e_fm2_dbus_storage_find(s->udi)) return; s->validated = 1; _e_stores = eina_list_append(_e_stores, s); @@ -73,7 +73,7 @@ e_fm2_hal_storage_add(E_Storage *s) } EAPI void -e_fm2_hal_storage_del(E_Storage *s) +e_fm2_dbus_storage_del(E_Storage *s) { // printf("STO- %s\n", s->udi); _e_stores = eina_list_remove(_e_stores, s); @@ -81,7 +81,7 @@ e_fm2_hal_storage_del(E_Storage *s) } EAPI E_Storage * -e_fm2_hal_storage_find(const char *udi) +e_fm2_dbus_storage_find(const char *udi) { Eina_List *l; E_Storage *s; @@ -101,11 +101,11 @@ e_fm2_hal_storage_find(const char *udi) #define KIBIBYTE_SIZE 1024 EAPI void -e_fm2_hal_volume_add(E_Volume *v) +e_fm2_dbus_volume_add(E_Volume *v) { E_Storage *s; - if (e_fm2_hal_volume_find(v->udi)) return; + if (e_fm2_dbus_volume_find(v->udi)) return; v->validated = 1; _e_vols = eina_list_append(_e_vols, v); @@ -140,7 +140,7 @@ e_fm2_hal_volume_add(E_Volume *v) { if (v->mount_point) eina_stringshare_del(v->mount_point); v->mount_point = NULL; - v->mount_point = e_fm2_hal_volume_mountpoint_get(v); + v->mount_point = e_fm2_dbus_volume_mountpoint_get(v); if ((!v->mount_point) || (v->mount_point[0] == 0)) { char buf[PATH_MAX]; @@ -163,7 +163,7 @@ e_fm2_hal_volume_add(E_Volume *v) } /* Search parent storage */ - if ((s = e_fm2_hal_storage_find(v->parent))) + if ((s = e_fm2_dbus_storage_find(v->parent))) { v->storage = s; s->volumes = eina_list_append(s->volumes, v); @@ -267,7 +267,7 @@ e_fm2_hal_volume_add(E_Volume *v) } EAPI void -e_fm2_hal_volume_del(E_Volume *v) +e_fm2_dbus_volume_del(E_Volume *v) { Eina_List *l, *l_nxt; E_Fm2_Mount *m; @@ -279,9 +279,9 @@ e_fm2_hal_volume_del(E_Volume *v) _e_fm2_volume_erase(v); EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m) { - _e_fm2_hal_unmount_ok(m); + _e_fm2_dbus_unmount_ok(m); v->mounts = eina_list_remove_list(v->mounts, l); - _e_fm2_hal_mount_free(m); + _e_fm2_dbus_mount_free(m); } _e_volume_free(v); } @@ -321,7 +321,7 @@ _e_fm2_volume_write(E_Volume *v) v->udi); fclose(f); - if (e_config->hal_desktop) + if (e_config->dbus_desktop) { e_user_homedir_snprintf(buf2, sizeof(buf2), "%s/|%s_%d.desktop", @@ -353,7 +353,7 @@ _e_fm2_volume_erase(E_Volume *v) ecore_file_unlink(buf); _e_fm2_file_force_update(buf); - if (e_config->hal_desktop) + if (e_config->dbus_desktop) { e_user_dir_snprintf(buf, sizeof(buf), "fileman/favorites/|%s_%d.desktop", @@ -364,7 +364,7 @@ _e_fm2_volume_erase(E_Volume *v) } EAPI E_Volume * -e_fm2_hal_volume_find(const char *udi) +e_fm2_dbus_volume_find(const char *udi) { Eina_List *l; E_Volume *v; @@ -379,7 +379,7 @@ e_fm2_hal_volume_find(const char *udi) } EAPI const char * -e_fm2_hal_volume_mountpoint_get(E_Volume *v) +e_fm2_dbus_volume_mountpoint_get(E_Volume *v) { char buf[PATH_MAX] = {0}; @@ -406,7 +406,7 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v) } EAPI void -e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint) +e_fm2_dbus_mount_add(E_Volume *v, const char *mountpoint) { Eina_List *l; E_Fm2_Mount *m; @@ -420,13 +420,13 @@ e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint) } EINA_LIST_FOREACH(v->mounts, l, m) - _e_fm2_hal_mount_ok(m); + _e_fm2_dbus_mount_ok(m); // printf("MOUNT %s %s\n", v->udi, v->mount_point); } EAPI void -e_fm2_hal_mount_del(E_Volume *v) +e_fm2_dbus_mount_del(E_Volume *v) { Eina_List *l, *l_nxt; E_Fm2_Mount *m; @@ -440,14 +440,14 @@ e_fm2_hal_mount_del(E_Volume *v) EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m) { - _e_fm2_hal_unmount_ok(m); + _e_fm2_dbus_unmount_ok(m); v->mounts = eina_list_remove_list(v->mounts, l); - _e_fm2_hal_mount_free(m); + _e_fm2_dbus_mount_free(m); } } EAPI void -_e_fm2_hal_mount_free(E_Fm2_Mount *m) +_e_fm2_dbus_mount_free(E_Fm2_Mount *m) { if (!m) return; @@ -458,7 +458,7 @@ _e_fm2_hal_mount_free(E_Fm2_Mount *m) } EAPI E_Fm2_Mount * -e_fm2_hal_mount_find(const char *path) +e_fm2_dbus_mount_find(const char *path) { Eina_List *l; E_Volume *v; @@ -474,7 +474,7 @@ e_fm2_hal_mount_find(const char *path) } EAPI E_Fm2_Mount * -e_fm2_hal_mount(E_Volume *v, +e_fm2_dbus_mount(E_Volume *v, void (*mount_ok) (void *data), void (*mount_fail) (void *data), void (*unmount_ok) (void *data), void (*unmount_fail) (void *data), void *data) @@ -513,7 +513,7 @@ e_fm2_hal_mount(E_Volume *v, } EAPI void -e_fm2_hal_mount_fail(E_Volume *v) +e_fm2_dbus_mount_fail(E_Volume *v) { Eina_List *l, *l_nxt; E_Fm2_Mount *m; @@ -527,27 +527,27 @@ e_fm2_hal_mount_fail(E_Volume *v) EINA_LIST_FOREACH_SAFE(v->mounts, l, l_nxt, m) { - _e_fm2_hal_mount_fail(m); + _e_fm2_dbus_mount_fail(m); v->mounts = eina_list_remove_list(v->mounts, l); - _e_fm2_hal_mount_free(m); + _e_fm2_dbus_mount_free(m); } } EAPI void -e_fm2_hal_unmount(E_Fm2_Mount *m) +e_fm2_dbus_unmount(E_Fm2_Mount *m) { E_Volume *v; if (!(v = m->volume)) return; v->mounts = eina_list_remove(v->mounts, m); - _e_fm2_hal_mount_free(m); + _e_fm2_dbus_mount_free(m); if (v->auto_unmount && v->mounted && !eina_list_count(v->mounts)) _e_fm2_client_unmount(v->udi); } EAPI void -e_fm2_hal_unmount_fail(E_Volume *v) +e_fm2_dbus_unmount_fail(E_Volume *v) { Eina_List *l; E_Fm2_Mount *m; @@ -555,11 +555,11 @@ e_fm2_hal_unmount_fail(E_Volume *v) v->mounted = 1; EINA_LIST_FOREACH(v->mounts, l, m) - _e_fm2_hal_unmount_fail(m); + _e_fm2_dbus_unmount_fail(m); } static void -_e_fm2_hal_mount_ok(E_Fm2_Mount *m) +_e_fm2_dbus_mount_ok(E_Fm2_Mount *m) { m->mounted = 1; if (m->volume) @@ -570,7 +570,7 @@ _e_fm2_hal_mount_ok(E_Fm2_Mount *m) } static void -_e_fm2_hal_mount_fail(E_Fm2_Mount *m) +_e_fm2_dbus_mount_fail(E_Fm2_Mount *m) { m->mounted = 0; if (m->mount_point) @@ -583,7 +583,7 @@ _e_fm2_hal_mount_fail(E_Fm2_Mount *m) } static void -_e_fm2_hal_unmount_ok(E_Fm2_Mount *m) +_e_fm2_dbus_unmount_ok(E_Fm2_Mount *m) { m->mounted = 0; if (m->mount_point) @@ -596,7 +596,7 @@ _e_fm2_hal_unmount_ok(E_Fm2_Mount *m) } static void -_e_fm2_hal_unmount_fail(E_Fm2_Mount *m) +_e_fm2_dbus_unmount_fail(E_Fm2_Mount *m) { m->mounted = 1; if (m->unmount_fail) @@ -604,7 +604,7 @@ _e_fm2_hal_unmount_fail(E_Fm2_Mount *m) } EAPI void -e_fm2_hal_show_desktop_icons(void) +e_fm2_dbus_show_desktop_icons(void) { Eina_List *l; E_Volume *v; @@ -636,7 +636,7 @@ e_fm2_hal_show_desktop_icons(void) } EAPI void -e_fm2_hal_hide_desktop_icons(void) +e_fm2_dbus_hide_desktop_icons(void) { Eina_List *l; E_Volume *v; @@ -663,7 +663,7 @@ e_fm2_hal_hide_desktop_icons(void) } EAPI Eina_List* -e_fm2_hal_volume_list_get(void) +e_fm2_dbus_volume_list_get(void) { return _e_vols; } diff --git a/src/bin/e_fm_dbus.h b/src/bin/e_fm_dbus.h index f1177ea07..645b8b0c1 100644 --- a/src/bin/e_fm_dbus.h +++ b/src/bin/e_fm_dbus.h @@ -1,35 +1,35 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#ifndef E_FM_HAL_H -#define E_FM_HAL_H +#ifndef E_FM_DBUS_H +#define E_FM_DBUS_H #include "e.h" #include "e_fm.h" -EAPI void e_fm2_hal_storage_add(E_Storage *s); -EAPI void e_fm2_hal_storage_del(E_Storage *s); -EAPI E_Storage *e_fm2_hal_storage_find(const char *udi); +EAPI void e_fm2_dbus_storage_add(E_Storage *s); +EAPI void e_fm2_dbus_storage_del(E_Storage *s); +EAPI E_Storage *e_fm2_dbus_storage_find(const char *udi); -EAPI void e_fm2_hal_volume_add(E_Volume *s); -EAPI void e_fm2_hal_volume_del(E_Volume *s); -EAPI E_Volume *e_fm2_hal_volume_find(const char *udi); -EAPI const char *e_fm2_hal_volume_mountpoint_get(E_Volume *v); +EAPI void e_fm2_dbus_volume_add(E_Volume *s); +EAPI void e_fm2_dbus_volume_del(E_Volume *s); +EAPI E_Volume *e_fm2_dbus_volume_find(const char *udi); +EAPI const char *e_fm2_dbus_volume_mountpoint_get(E_Volume *v); -EAPI void e_fm2_hal_mount_add(E_Volume *v, const char *mountpoint); -EAPI void e_fm2_hal_mount_del(E_Volume *v); -EAPI E_Fm2_Mount *e_fm2_hal_mount_find(const char *path); -EAPI E_Fm2_Mount *e_fm2_hal_mount(E_Volume *v, +EAPI void e_fm2_dbus_mount_add(E_Volume *v, const char *mountpoint); +EAPI void e_fm2_dbus_mount_del(E_Volume *v); +EAPI E_Fm2_Mount *e_fm2_dbus_mount_find(const char *path); +EAPI E_Fm2_Mount *e_fm2_dbus_mount(E_Volume *v, void (*mount_ok) (void *data), void (*mount_fail) (void *data), void (*unmount_ok) (void *data), void (*unmount_fail) (void *data), void *data); -EAPI void e_fm2_hal_mount_fail(E_Volume *v); -EAPI void e_fm2_hal_unmount(E_Fm2_Mount *m); -EAPI void e_fm2_hal_unmount_fail(E_Volume *v); +EAPI void e_fm2_dbus_mount_fail(E_Volume *v); +EAPI void e_fm2_dbus_unmount(E_Fm2_Mount *m); +EAPI void e_fm2_dbus_unmount_fail(E_Volume *v); -EAPI void e_fm2_hal_show_desktop_icons(void); -EAPI void e_fm2_hal_hide_desktop_icons(void); +EAPI void e_fm2_dbus_show_desktop_icons(void); +EAPI void e_fm2_dbus_hide_desktop_icons(void); -EAPI Eina_List *e_fm2_hal_volume_list_get(void); +EAPI Eina_List *e_fm2_dbus_volume_list_get(void); #endif diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c index dd6b3254d..30487acb7 100644 --- a/src/bin/e_fm_main.c +++ b/src/bin/e_fm_main.c @@ -304,17 +304,17 @@ main(int argc, char **argv) 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", + e_dbus_signal_handler_add(_e_dbus_conn, E_HAL_SENDER, + E_HAL_MANAGER_PATH, + E_HAL_MANAGER_INTERFACE, "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", + e_dbus_signal_handler_add(_e_dbus_conn, E_HAL_SENDER, + E_HAL_MANAGER_PATH, + E_HAL_MANAGER_INTERFACE, "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", + e_dbus_signal_handler_add(_e_dbus_conn, E_HAL_SENDER, + E_HAL_MANAGER_PATH, + E_HAL_MANAGER_INTERFACE, "NewCapability", _e_dbus_cb_cap_add, NULL); } @@ -850,9 +850,9 @@ e_volume_add(const char *udi, char first_time) _e_vols = eina_list_append(_e_vols, v); e_hal_device_get_all_properties(_e_dbus_conn, v->udi, _e_dbus_cb_vol_prop, v); - v->prop_handler = e_dbus_signal_handler_add(_e_dbus_conn, "org.freedesktop.Hal", + v->prop_handler = e_dbus_signal_handler_add(_e_dbus_conn, E_HAL_SENDER, udi, - "org.freedesktop.Hal.Device", + E_HAL_DEVICE_INTERFACE, "PropertyModified", _e_dbus_cb_prop_modified, v); v->guard = NULL; diff --git a/src/modules/fileman/e_mod_config.c b/src/modules/fileman/e_mod_config.c index 8106af0e5..cd20ca330 100644 --- a/src/modules/fileman/e_mod_config.c +++ b/src/modules/fileman/e_mod_config.c @@ -67,7 +67,7 @@ struct _E_Config_Dialog_Data int desktop; int auto_mount; int auto_open; - } hal; + } dbus; E_Config_Dialog *cfd; }; @@ -126,9 +126,9 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->selection.windows_modifiers = fileman_config->selection.windows_modifiers; cfdata->list.sort.dirs.first = fileman_config->list.sort.dirs.first; cfdata->list.sort.case_sen = !(fileman_config->list.sort.no_case); - cfdata->hal.desktop = e_config->hal_desktop; - cfdata->hal.auto_mount = e_config->hal_auto_mount; - cfdata->hal.auto_open = e_config->hal_auto_open; + cfdata->dbus.desktop = e_config->dbus_desktop; + cfdata->dbus.auto_mount = e_config->dbus_auto_mount; + cfdata->dbus.auto_open = e_config->dbus_auto_open; } static void @@ -159,14 +159,14 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) fileman_config->list.sort.dirs.last = !(cfdata->list.sort.dirs.first); fileman_config->list.sort.no_case = !(cfdata->list.sort.case_sen); - e_config->hal_desktop = cfdata->hal.desktop; - if(e_config->hal_desktop) - e_fm2_hal_show_desktop_icons(); + e_config->dbus_desktop = cfdata->dbus.desktop; + if(e_config->dbus_desktop) + e_fm2_dbus_show_desktop_icons(); else - e_fm2_hal_hide_desktop_icons(); + e_fm2_dbus_hide_desktop_icons(); - e_config->hal_auto_mount = cfdata->hal.auto_mount; - e_config->hal_auto_open = cfdata->hal.auto_open; + e_config->dbus_auto_mount = cfdata->dbus.auto_mount; + e_config->dbus_auto_open = cfdata->dbus.auto_open; e_config_save_queue(); @@ -192,9 +192,9 @@ _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) (fileman_config->list.sort.dirs.first != cfdata->list.sort.dirs.first) || (fileman_config->list.sort.dirs.last != !(cfdata->list.sort.dirs.first)) || (fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) || - (e_config->hal_desktop != cfdata->hal.desktop) || - (e_config->hal_auto_mount != cfdata->hal.auto_mount) || - (e_config->hal_auto_open != cfdata->hal.auto_open)); + (e_config->dbus_desktop != cfdata->dbus.desktop) || + (e_config->dbus_auto_mount != cfdata->dbus.auto_mount) || + (e_config->dbus_auto_open != cfdata->dbus.auto_open)); } static Evas_Object * @@ -268,14 +268,18 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 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 ob = e_widget_check_add(evas, _("Show HAL icons on desktop"), - &(cfdata->hal.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"), - &(cfdata->hal.auto_mount)); + &(cfdata->dbus.auto_mount)); e_widget_list_object_append(o, ob, 1, 1, 0.5); ob = e_widget_check_add(evas, _("Open filemanager on mount"), - &(cfdata->hal.auto_open)); + &(cfdata->dbus.auto_open)); e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_toolbook_page_append(otb, NULL, _("HAL"), o, 0, 0, 0, 0, 0.5, 0.0); diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index a317c0b16..c6fe726fb 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -347,7 +347,7 @@ _e_mod_menu_generate(void *data, E_Menu *m) /* Volumes */ Eina_Bool volumes_visible = 0; - EINA_LIST_FOREACH(e_fm2_hal_volume_list_get(), l, vol) + EINA_LIST_FOREACH(e_fm2_dbus_volume_list_get(), l, vol) { if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;