enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Places: Honor the XDG_DESKTOP_DIR in the menu, and fix opening volumes from the menu. 

SVN revision: 84538
This commit is contained in:
Davide Andreoli 2013-04-29 19:41:09 +00:00 committed by Tom Hacohen
parent 5d7c7e1264
commit 74f3a86e33
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/e_mod_places.c
View File

@ -712,7 +712,7 @@ _places_icon_activated_cb(void *data, Evas_Object *o, const char *emission, cons
Volume *vol = data; Volume *vol = data;
if (vol->mounted) if (vol->mounted)
_places_run_fm((void*)vol->mount_point); _places_run_fm(vol->mount_point);
else else
{ {
vol->force_open = EINA_TRUE; vol->force_open = EINA_TRUE;
@ -748,7 +748,7 @@ _places_header_activated_cb(void *data, Evas_Object *o, const char *emission, co
void void
_places_menu_cb(void *data, E_Menu *m, E_Menu_Item *mi) _places_menu_cb(void *data, E_Menu *m, E_Menu_Item *mi)
{ {
_places_run_fm((const char*) data); _places_run_fm(data);
} }
static void static void
@ -795,7 +795,6 @@ void
places_generate_menu(void *data, E_Menu *em) places_generate_menu(void *data, E_Menu *em)
{ {
E_Menu_Item *mi; E_Menu_Item *mi;
char buf[PATH_MAX];
// Home // Home
if (places_conf->show_home) if (places_conf->show_home)
@ -803,7 +802,7 @@ places_generate_menu(void *data, E_Menu *em)
mi = e_menu_item_new(em); mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Home")); e_menu_item_label_set(mi, D_("Home"));
e_util_menu_item_theme_icon_set(mi, "user-home"); e_util_menu_item_theme_icon_set(mi, "user-home");
e_menu_item_callback_set(mi, _places_menu_cb, (char*)e_user_homedir_get()); e_menu_item_callback_set(mi, _places_menu_cb, e_user_homedir_get());
} }
// Desktop // Desktop
@ -812,8 +811,7 @@ places_generate_menu(void *data, E_Menu *em)
mi = e_menu_item_new(em); mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Desktop")); e_menu_item_label_set(mi, D_("Desktop"));
e_util_menu_item_theme_icon_set(mi, "user-desktop"); e_util_menu_item_theme_icon_set(mi, "user-desktop");
snprintf(buf, sizeof(buf), "%s/Desktop", (char*)e_user_homedir_get()); e_menu_item_callback_set(mi, _places_menu_cb, efreet_desktop_dir_get());
e_menu_item_callback_set(mi, _places_menu_cb, strdup(buf)); //TODO free somewhere
} }
// Trash // Trash
@ -870,7 +868,7 @@ places_generate_menu(void *data, E_Menu *em)
if (vol->icon) if (vol->icon)
e_util_menu_item_theme_icon_set(mi, vol->icon); e_util_menu_item_theme_icon_set(mi, vol->icon);
e_menu_item_callback_set(mi, _places_menu_cb, vol); e_menu_item_callback_set(mi, _places_menu_cb, vol->mount_point);
volumes_visible = 1; volumes_visible = 1;
} }