vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-wide: get rid of trailing whitespace (part 9) 

Remove trailing whitespaces

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D11829
This commit is contained in:
Elyes HAOUAS 2020-05-13 19:31:20 +00:00 committed by Stefan Schmidt
parent 0a9e0003d8
commit bead80ca23
10 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/everything/evry_plug_apps.c
View File

@ -1512,7 +1512,7 @@ _scan_idler(void *data EINA_UNUSED)
{ {
E_Exe *ee; E_Exe *ee;
Eina_List *l, *l2 = exe_files; Eina_List *l, *l2 = exe_files;
EINA_LIST_FOREACH(exe_list, l ,ee) EINA_LIST_FOREACH(exe_list, l ,ee)
{ {
if (ee->path != l2->data) if (ee->path != l2->data)
@ -1558,7 +1558,7 @@ _scan_idler(void *data EINA_UNUSED)
e_config_domain_save(_exebuf_cache_file, exelist_edd, el); e_config_domain_save(_exebuf_cache_file, exelist_edd, el);
INF("plugin exebuf save: %s, %d", _exebuf_cache_file, eina_list_count(el->list)); INF("plugin exebuf save: %s, %d", _exebuf_cache_file, eina_list_count(el->list));
exe_list = el->list; exe_list = el->list;
free(el); free(el);
} }
@ -1578,7 +1578,7 @@ _scan_idler(void *data EINA_UNUSED)
dir = exe_path->data; dir = exe_path->data;
exe_dir = eina_file_direct_ls(dir); exe_dir = eina_file_direct_ls(dir);
INF("scan dir: %s", dir); INF("scan dir: %s", dir);
} }
/* if we have an opened dir - scan the next item */ /* if we have an opened dir - scan the next item */
if (exe_dir) if (exe_dir)
@ -1658,7 +1658,7 @@ _exe_path_list()
} }
if (pp > last) if (pp > last)
exe_path = eina_list_append(exe_path, strdup(last)); exe_path = eina_list_append(exe_path, strdup(last));
free(path); free(path);
} }
@ -1681,7 +1681,7 @@ _scan_executables()
{ {
exe_list = el->list; exe_list = el->list;
INF("plugin exebuf load: %s, %d", _exebuf_cache_file, eina_list_count(el->list)); INF("plugin exebuf load: %s, %d", _exebuf_cache_file, eina_list_count(el->list));
free(el); free(el);
} }

8
src/modules/everything/evry_plug_calc.c
View File

@ -79,16 +79,16 @@ _finish(Evry_Plugin *plugin)
if (it == cur_item) if (it == cur_item)
cur_item = NULL; cur_item = NULL;
EVRY_ITEM_FREE(it); EVRY_ITEM_FREE(it);
} }
if (cur_item) if (cur_item)
{ {
EVRY_ITEM_FREE(cur_item); EVRY_ITEM_FREE(cur_item);
cur_item = NULL; cur_item = NULL;
} }
EINA_LIST_FREE (handlers, h) EINA_LIST_FREE (handlers, h)
ecore_event_handler_del(h); ecore_event_handler_del(h);
@ -177,7 +177,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
eina_stringshare_del(result); eina_stringshare_del(result);
} }
} }
if (!strncmp(input, "scale=", 6)) if (!strncmp(input, "scale=", 6))
snprintf(buf, 1024, "%s\n", input); snprintf(buf, 1024, "%s\n", input);
else else

6
src/modules/everything/evry_types.h
View File

@ -51,7 +51,7 @@ struct _Evry_Item
/* optional */ /* optional */
Evry_Type subtype; Evry_Type subtype;
Evas_Object *(*icon_get) (Evry_Item *it, Evas *e); Evas_Object *(*icon_get) (Evry_Item *it, Evas *e);
void (*free) (Evry_Item *it); void (*free) (Evry_Item *it);
@ -71,7 +71,7 @@ struct _Evry_Action
/* identifier */ /* identifier */
const char *name; const char *name;
struct struct
{ {
/* requested type for action */ /* requested type for action */
@ -186,7 +186,7 @@ struct _Evry_Plugin
/* optional: list of Evry_Action that are specific for items of this plugin */ /* optional: list of Evry_Action that are specific for items of this plugin */
Eina_List *actions; Eina_List *actions;
/* optional: set type which the plugin can handle in 'begin' */ /* optional: set type which the plugin can handle in 'begin' */
Evry_Type input_type; Evry_Type input_type;

12
src/modules/everything/evry_view.c
View File

@ -504,13 +504,13 @@ _e_smart_reconfigure_do(void *data)
sd->idle_enter = NULL; sd->idle_enter = NULL;
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
if (sd->view->hiding) if (sd->view->hiding)
{ {
sd->idle_enter = NULL; sd->idle_enter = NULL;
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }
if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w; if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h; if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
if (sd->cx < 0) sd->cx = 0; if (sd->cx < 0) sd->cx = 0;
@ -958,9 +958,9 @@ _update_frame(Evas_Object *obj)
ecore_idle_enterer_del(sd->idle_enter); ecore_idle_enterer_del(sd->idle_enter);
sd->idle_enter = NULL; sd->idle_enter = NULL;
} }
sd->place = EINA_TRUE; sd->place = EINA_TRUE;
_e_smart_reconfigure_do(obj); _e_smart_reconfigure_do(obj);
_pan_item_select(obj, sd->cur_item, 0); _pan_item_select(obj, sd->cur_item, 0);
@ -1471,7 +1471,7 @@ _view_cb_mouse_wheel(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o
} }
} }
// FIXME: 'drag into' make mouse input hang after some trials // FIXME: 'drag into' make mouse input hang after some trials
#if 0 #if 0
static void static void
_view_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) _view_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
@ -1526,7 +1526,7 @@ _view_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE
edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e"); edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
goto end; goto end;
} }
if ((sel->states->next) || (sel != sel->win->selectors[0])) if ((sel->states->next) || (sel != sel->win->selectors[0]))
edje_object_signal_emit(sd->view->bg, "e,action,show,back", "e"); edje_object_signal_emit(sd->view->bg, "e,action,show,back", "e");

34
src/modules/fileman/e_fwin.c
View File

@ -52,7 +52,7 @@ struct _E_Fwin
Ecore_Timer *spring_close_timer; Ecore_Timer *spring_close_timer;
E_Fwin *spring_parent; E_Fwin *spring_parent;
E_Fwin *spring_child; E_Fwin *spring_child;
Ecore_Event_Handler *zone_handler; Ecore_Event_Handler *zone_handler;
Ecore_Event_Handler *zone_del_handler; Ecore_Event_Handler *zone_del_handler;
}; };
@ -547,7 +547,7 @@ e_fwin_zone_shutdown(E_Zone *zone)
{ {
Eina_List *f, *fn; Eina_List *f, *fn;
E_Fwin *fwin; E_Fwin *fwin;
EINA_LIST_FOREACH_SAFE(fwins, f, fn, fwin) EINA_LIST_FOREACH_SAFE(fwins, f, fn, fwin)
{ {
@ -746,7 +746,7 @@ _e_fwin_new(const char *dev,
// o = e_icon_add(evas_object_evas_get(fwin->win)); // o = e_icon_add(evas_object_evas_get(fwin->win));
// e_icon_scale_size_set(o, 0); // e_icon_scale_size_set(o, 0);
// e_icon_fill_inside_set(o, 0); // e_icon_fill_inside_set(o, 0);
edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr), edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr),
"e.swallow.overlay", o); "e.swallow.overlay", o);
evas_object_pass_events_set(o, 1); evas_object_pass_events_set(o, 1);
fwin->over_obj = o; fwin->over_obj = o;
@ -940,14 +940,14 @@ _e_fwin_icon_popup(void *data)
mw = zone->w * fileman_config->tooltip.size / 100.0; mw = zone->w * fileman_config->tooltip.size / 100.0;
mh = zone->h * fileman_config->tooltip.size / 100.0; mh = zone->h * fileman_config->tooltip.size / 100.0;
edje_object_part_text_set(bg, "e.text.title", edje_object_part_text_set(bg, "e.text.title",
popup_icon->label ? popup_icon->label ?
popup_icon->label : popup_icon->file); popup_icon->label : popup_icon->file);
list = e_widget_list_add(e_comp->evas, 0, 0); list = e_widget_list_add(e_comp->evas, 0, 0);
if (fwin->win) if (fwin->win)
evas_object_event_callback_add(fwin->win, EVAS_CALLBACK_DEL, _e_fwin_popup_del, list); evas_object_event_callback_add(fwin->win, EVAS_CALLBACK_DEL, _e_fwin_popup_del, list);
o = e_widget_filepreview_add(e_comp->evas, mw, mh, 0); o = e_widget_filepreview_add(e_comp->evas, mw, mh, 0);
e_widget_filepreview_clamp_video_set(o, fileman_config->tooltip.clamp_size); e_widget_filepreview_clamp_video_set(o, fileman_config->tooltip.clamp_size);
e_widget_filepreview_path_set(o, buf, popup_icon->mime); e_widget_filepreview_path_set(o, buf, popup_icon->mime);
@ -1065,7 +1065,7 @@ _e_fwin_page_favorites_add(E_Fwin_Page *page)
e_fm2_pan_get, e_fm2_pan_get,
e_fm2_pan_max_get, e_fm2_pan_max_get,
e_fm2_pan_child_size_get); e_fm2_pan_child_size_get);
e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o), e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o),
"base/theme/fileman", "base/theme/fileman",
"e/fileman/default/scrollframe"); "e/fileman/default/scrollframe");
evas_object_propagate_events_set(page->flist, 0); evas_object_propagate_events_set(page->flist, 0);
@ -1385,7 +1385,7 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop,
E_Fwin *fwin = page->fwin; E_Fwin *fwin = page->fwin;
E_Fm2_Icon_Info *ici; E_Fm2_Icon_Info *ici;
char *file; char *file;
skip_history = EINA_FALSE; skip_history = EINA_FALSE;
selected = e_fm2_selected_list_get(page->fm_obj); selected = e_fm2_selected_list_get(page->fm_obj);
@ -1868,7 +1868,7 @@ _e_fwin_changed(void *data,
evas_object_hide(fwin->over_obj); evas_object_hide(fwin->over_obj);
if (fwin->overlay_file) if (fwin->overlay_file)
{ {
edje_object_file_set(fwin->over_obj, fwin->overlay_file, edje_object_file_set(fwin->over_obj, fwin->overlay_file,
"e/desktop/background"); "e/desktop/background");
// ext = strrchr(fwin->overlay_file, '.'); // ext = strrchr(fwin->overlay_file, '.');
// if (ext && !strcasecmp(ext, ".edj")) // if (ext && !strcasecmp(ext, ".edj"))
@ -2238,7 +2238,7 @@ _e_fwin_cb_menu_extend_start(void *data,
mi = e_menu_item_new_relative(subm, mi); mi = e_menu_item_new_relative(subm, mi);
e_menu_item_separator_set(mi, EINA_TRUE); e_menu_item_separator_set(mi, EINA_TRUE);
mi = e_menu_item_new(m); mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, EINA_TRUE); e_menu_item_separator_set(mi, EINA_TRUE);
#endif #endif
@ -2247,7 +2247,7 @@ _e_fwin_cb_menu_extend_start(void *data,
while (eina_list_count(selected) == 1) while (eina_list_count(selected) == 1)
{ {
if (_e_fwin_file_is_exec(eina_list_data_get(selected)) == E_FWIN_EXEC_NONE) break; if (_e_fwin_file_is_exec(eina_list_data_get(selected)) == E_FWIN_EXEC_NONE) break;
e_menu_item_label_set(mi, _("Run")); e_menu_item_label_set(mi, _("Run"));
e_util_menu_item_theme_icon_set(mi, "system-run"); e_util_menu_item_theme_icon_set(mi, "system-run");
set = EINA_TRUE; set = EINA_TRUE;
@ -2493,7 +2493,7 @@ _e_fwin_open(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Win_Mode win_mode,
return NULL; return NULL;
} }
_e_fwin_border_set(page, fwin, ici); _e_fwin_border_set(page, fwin, ici);
return fwin; return fwin;
} }
@ -2629,9 +2629,9 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
dia = e_dialog_new(NULL, dia = e_dialog_new(NULL,
"E", "_fwin_open_apps"); "E", "_fwin_open_apps");
else return; /* make clang happy */ else return; /* make clang happy */
e_dialog_resizable_set(dia, 1); e_dialog_resizable_set(dia, 1);
fad = E_NEW(E_Fwin_Apps_Dialog, 1); fad = E_NEW(E_Fwin_Apps_Dialog, 1);
e_dialog_title_set(dia, _("Open with...")); e_dialog_title_set(dia, _("Open with..."));
e_dialog_button_add(dia, _("Open"), "document-open", e_dialog_button_add(dia, _("Open"), "document-open",
@ -2812,7 +2812,7 @@ _e_fwin_file_open_dialog_cb_key_down(void *data,
if (!strcmp(ev->key, "Escape")) if (!strcmp(ev->key, "Escape"))
_e_fwin_cb_close(fwin->fad, fwin->fad->dia); _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
else if ((!strcmp(ev->key, "Return")) || else if ((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->key, "KP_Enter"))) (!strcmp(ev->key, "KP_Enter")))
_e_fwin_cb_open(fwin->fad, fwin->fad->dia); _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
} }
@ -3032,7 +3032,7 @@ _e_fwin_op_registry_listener_cb(void *data,
char *total; char *total;
int mw, mh; int mw, mh;
Edje_Message_Float msg; Edje_Message_Float msg;
// Don't show if the operation keep less than 1 second // Don't show if the operation keep less than 1 second
if (ere->start_time + 1.0 > ecore_loop_time_get()) return; if (ere->start_time + 1.0 > ecore_loop_time_get()) return;
@ -3146,7 +3146,7 @@ _e_fwin_op_registry_listener_cb(void *data,
edje_object_signal_emit(o, "e,state,busy,start", "e"); edje_object_signal_emit(o, "e,state,busy,start", "e");
} }
} }
// Update element // Update element
edje_object_part_drag_size_set(o, "e.gauge.bar", edje_object_part_drag_size_set(o, "e.gauge.bar",
((double)(ere->percent)) / 100.0, 1.0); ((double)(ere->percent)) / 100.0, 1.0);

2
src/modules/fileman/e_fwin_nav.c
View File

@ -97,7 +97,7 @@ _event_deleted(Nav_Item *ni, int type, void *e)
} }
else else
dir = ev->filename; dir = ev->filename;
if (ni->path != dir) return ECORE_CALLBACK_RENEW; if (ni->path != dir) return ECORE_CALLBACK_RENEW;
if (ni == ni->inst->sel_ni) if (ni == ni->inst->sel_ni)
{ {

2
src/modules/fileman/e_int_config_mime.c
View File

@ -165,7 +165,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
Evas_Object *ob; Evas_Object *ob;
e_dialog_resizable_set(cfd->dia, 1); e_dialog_resizable_set(cfd->dia, 1);
o = e_widget_list_add(evas, 1, 1); o = e_widget_list_add(evas, 1, 1);
of = e_widget_framelist_add(evas, _("Categories"), 0); of = e_widget_framelist_add(evas, _("Categories"), 0);
ol = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_type)); ol = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_type));

126
src/modules/fileman/e_int_config_mime_edit.c
View File

@ -15,7 +15,7 @@ static void _cb_fsel_cancel (void *data, E_Dialog *dia);
static void _cb_file_change (void *data); static void _cb_file_change (void *data);
typedef enum _Icon_Type Icon_Type; typedef enum _Icon_Type Icon_Type;
enum _Icon_Type enum _Icon_Type
{ {
THUMB, THUMB,
THEME, THEME,
@ -24,14 +24,14 @@ enum _Icon_Type
DEFAULT DEFAULT
}; };
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
char *mime; char *mime;
char *icon; char *icon;
int type; int type;
char *file; char *file;
struct struct
{ {
Evas_Object *icon; Evas_Object *icon;
Evas_Object *icon_wid, *fsel_wid; Evas_Object *icon_wid, *fsel_wid;
@ -45,18 +45,18 @@ struct _E_Config_Dialog_Data
#define IFFREE(src) if (src) free(src); src = NULL; #define IFFREE(src) if (src) free(src); src = NULL;
E_Config_Dialog * E_Config_Dialog *
e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2) e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL; if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL;
cfdata = E_NEW(E_Config_Dialog_Data, 1); cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->data = data; cfdata->data = data;
cfdata->data2 = data2; cfdata->data2 = data2;
v = E_NEW(E_Config_Dialog_View, 1); v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
@ -64,21 +64,21 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
v->basic.check_changed = _basic_check; v->basic.check_changed = _basic_check;
v->basic.apply_cfdata = _basic_apply; v->basic.apply_cfdata = _basic_apply;
cfd = e_config_dialog_new(NULL, _("File Icon"), "E", cfd = e_config_dialog_new(NULL, _("File Icon"), "E",
"fileman/mime_edit_dialog", "fileman/mime_edit_dialog",
"preferences-file-icons", 0, v, cfdata); "preferences-file-icons", 0, v, cfdata);
return cfd; return cfd;
} }
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
_fill_data(cfd, cfd->data); _fill_data(cfd, cfd->data);
return cfd->data; return cfd->data;
} }
static void static void
_fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
E_Config_Mime_Icon *mi; E_Config_Mime_Icon *mi;
@ -87,19 +87,19 @@ _fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
IFDUP(mi->mime, cfdata->mime); IFDUP(mi->mime, cfdata->mime);
IFDUP(mi->icon, cfdata->icon); IFDUP(mi->icon, cfdata->icon);
IFDUP(mi->icon, cfdata->file); IFDUP(mi->icon, cfdata->file);
if (!cfdata->icon) if (!cfdata->icon)
cfdata->type = DEFAULT; cfdata->type = DEFAULT;
else else
{ {
if (!strcmp(cfdata->icon, "THUMB")) if (!strcmp(cfdata->icon, "THUMB"))
cfdata->type = THUMB; cfdata->type = THUMB;
else if (!strncmp(cfdata->icon, "e/icons/fileman/mime", 20)) else if (!strncmp(cfdata->icon, "e/icons/fileman/mime", 20))
cfdata->type = THEME; cfdata->type = THEME;
else else
{ {
char *p; char *p;
p = strrchr(cfdata->icon, '.'); p = strrchr(cfdata->icon, '.');
if ((p) && (!strcmp(p, ".edj"))) if ((p) && (!strcmp(p, ".edj")))
cfdata->type = EDJ; cfdata->type = EDJ;
@ -110,11 +110,11 @@ _fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
} }
static void static void
_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
if (cfdata->gui.fsel) if (cfdata->gui.fsel)
e_object_del(E_OBJECT(cfdata->gui.fsel)); e_object_del(E_OBJECT(cfdata->gui.fsel));
IFFREE(cfdata->file); IFFREE(cfdata->file);
IFFREE(cfdata->mime); IFFREE(cfdata->mime);
IFFREE(cfdata->icon); IFFREE(cfdata->icon);
@ -123,12 +123,12 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *of; Evas_Object *o, *of;
Evas_Object *ob, *oi, *icon; Evas_Object *ob, *oi, *icon;
E_Radio_Group *rg; E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("Basic Info"), 0); of = e_widget_frametable_add(evas, _("Basic Info"), 0);
@ -139,7 +139,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_size_min_set(ob, 100, 1); e_widget_size_min_set(ob, 100, 1);
e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_frametable_add(evas, _("Icon"), 0); of = e_widget_frametable_add(evas, _("Icon"), 0);
rg = e_widget_radio_group_new(&cfdata->type); rg = e_widget_radio_group_new(&cfdata->type);
ob = e_widget_radio_add(evas, _("Use Generated Thumbnail"), 0, rg); ob = e_widget_radio_add(evas, _("Use Generated Thumbnail"), 0, rg);
@ -160,17 +160,17 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
oi = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd); oi = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd);
cfdata->gui.icon_wid = oi; cfdata->gui.icon_wid = oi;
if (cfdata->icon) if (cfdata->icon)
{ {
icon = _get_icon(cfdata); icon = _get_icon(cfdata);
if (icon) if (icon)
e_widget_button_icon_set(oi, icon); e_widget_button_icon_set(oi, icon);
} }
e_widget_size_min_set(oi, 48, 48); e_widget_size_min_set(oi, 48, 48);
e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1); e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
switch (cfdata->type) switch (cfdata->type)
{ {
case EDJ: case EDJ:
case IMG: case IMG:
@ -180,7 +180,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_disabled_set(cfdata->gui.icon_wid, 1); e_widget_disabled_set(cfdata->gui.icon_wid, 1);
break; break;
} }
return o; return o;
} }
@ -203,14 +203,14 @@ _basic_check(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
} }
static int static int
_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
Eina_List *l; Eina_List *l;
E_Config_Mime_Icon *mi; E_Config_Mime_Icon *mi;
char buf[4096]; char buf[4096];
int found = 0; int found = 0;
for (l = e_config->mime_icons; l; l = l->next) for (l = e_config->mime_icons; l; l = l->next)
{ {
mi = l->data; mi = l->data;
if (!mi) continue; if (!mi) continue;
@ -218,20 +218,20 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
found = 1; found = 1;
break; break;
} }
if (found) if (found)
{ {
if (mi->icon) if (mi->icon)
eina_stringshare_del(mi->icon); eina_stringshare_del(mi->icon);
} }
else else
{ {
if (cfdata->type == DEFAULT) return 1; if (cfdata->type == DEFAULT) return 1;
mi = E_NEW(E_Config_Mime_Icon, 1); mi = E_NEW(E_Config_Mime_Icon, 1);
mi->mime = eina_stringshare_add(cfdata->mime); mi->mime = eina_stringshare_add(cfdata->mime);
} }
switch (cfdata->type) switch (cfdata->type)
{ {
case THUMB: case THUMB:
mi->icon = eina_stringshare_add("THUMB"); mi->icon = eina_stringshare_add("THUMB");
@ -257,7 +257,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
if (!found) if (!found)
e_config->mime_icons = eina_list_append(e_config->mime_icons, mi); e_config->mime_icons = eina_list_append(e_config->mime_icons, mi);
e_config_save_queue(); e_config_save_queue();
e_fm_mime_icon_cache_flush(); e_fm_mime_icon_cache_flush();
e_fm2_all_icons_update(); e_fm2_all_icons_update();
@ -275,22 +275,22 @@ _dia_del(void *data)
cfdata->gui.fsel = NULL; cfdata->gui.fsel = NULL;
} }
static void static void
_cb_icon_sel(void *data, void *data2) _cb_icon_sel(void *data, void *data2)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Dialog *dia; E_Dialog *dia;
Evas_Object *o; Evas_Object *o;
Evas_Coord w, h; Evas_Coord w, h;
cfdata = data; cfdata = data;
if (!cfdata) return; if (!cfdata) return;
if (cfdata->gui.fsel) return; if (cfdata->gui.fsel) return;
cfd = data2; cfd = data2;
if (!cfd) return; if (!cfd) return;
dia = e_dialog_new(NULL, "E", "_mime_icon_select_dialog"); dia = e_dialog_new(NULL, "E", "_mime_icon_select_dialog");
if (!dia) return; if (!dia) return;
if (cfdata->type == EDJ) if (cfdata->type == EDJ)
@ -299,7 +299,7 @@ _cb_icon_sel(void *data, void *data2)
e_dialog_title_set(dia, _("Select an image")); e_dialog_title_set(dia, _("Select an image"));
e_dialog_resizable_set(dia, 1); e_dialog_resizable_set(dia, 1);
dia->data = cfdata; dia->data = cfdata;
e_object_del_attach_func_set(E_OBJECT(dia), _dia_del); e_object_del_attach_func_set(E_OBJECT(dia), _dia_del);
o = e_widget_fsel_add(evas_object_evas_get(dia->win), "~/", "/", NULL, NULL, o = e_widget_fsel_add(evas_object_evas_get(dia->win), "~/", "/", NULL, NULL,
@ -309,24 +309,24 @@ _cb_icon_sel(void *data, void *data2)
evas_object_show(o); evas_object_show(o);
e_widget_size_min_get(o, &w, &h); e_widget_size_min_get(o, &w, &h);
e_dialog_content_set(dia, o, w, h); e_dialog_content_set(dia, o, w, h);
e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata); e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata); e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata);
elm_win_center(dia->win, 1, 1); elm_win_center(dia->win, 1, 1);
e_dialog_show(dia); e_dialog_show(dia);
e_dialog_border_icon_set(dia, "enlightenment/file_icons"); e_dialog_border_icon_set(dia, "enlightenment/file_icons");
cfdata->gui.fsel = dia; cfdata->gui.fsel = dia;
} }
static Evas_Object * static Evas_Object *
_get_icon(void *data) _get_icon(void *data)
{ {
Evas *evas; Evas *evas;
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
Evas_Object *icon = NULL; Evas_Object *icon = NULL;
char buf[4096]; char buf[4096];
cfdata = data; cfdata = data;
if (!cfdata) return NULL; if (!cfdata) return NULL;
@ -334,11 +334,11 @@ _get_icon(void *data)
if (cfdata->gui.icon) if (cfdata->gui.icon)
evas_object_del(cfdata->gui.icon); evas_object_del(cfdata->gui.icon);
cfdata->gui.icon = NULL; cfdata->gui.icon = NULL;
if (cfdata->type == DEFAULT) return NULL; if (cfdata->type == DEFAULT) return NULL;
evas = evas_object_evas_get(cfdata->gui.icon_wid); evas = evas_object_evas_get(cfdata->gui.icon_wid);
switch (cfdata->type) switch (cfdata->type)
{ {
case THUMB: case THUMB:
icon = edje_object_add(evas); icon = edje_object_add(evas);
@ -362,19 +362,19 @@ _get_icon(void *data)
default: default:
break; break;
} }
cfdata->gui.icon = icon; cfdata->gui.icon = icon;
return icon; return icon;
} }
static void static void
_cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = data; cfdata = data;
if (!cfdata) return; if (!cfdata) return;
switch (cfdata->type) switch (cfdata->type)
{ {
case EDJ: case EDJ:
case IMG: case IMG:
@ -386,24 +386,24 @@ _cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
} }
} }
static void static void
_cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED) _cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = data; cfdata = data;
if (!cfdata) return; if (!cfdata) return;
} }
static void static void
_cb_fsel_ok(void *data, E_Dialog *dia) _cb_fsel_ok(void *data, E_Dialog *dia)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
const char *file; const char *file;
cfdata = data; cfdata = data;
if (!cfdata) return; if (!cfdata) return;
file = e_widget_fsel_selection_path_get(cfdata->gui.fsel_wid); file = e_widget_fsel_selection_path_get(cfdata->gui.fsel_wid);
IFFREE(cfdata->file); IFFREE(cfdata->file);
IFDUP(file, cfdata->file); IFDUP(file, cfdata->file);
@ -412,26 +412,26 @@ _cb_fsel_ok(void *data, E_Dialog *dia)
_cb_file_change(cfdata); _cb_file_change(cfdata);
} }
static void static void
_cb_fsel_cancel(void *data, E_Dialog *dia) _cb_fsel_cancel(void *data, E_Dialog *dia)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
cfdata = data; cfdata = data;
e_object_del(E_OBJECT(dia)); e_object_del(E_OBJECT(dia));
cfdata->gui.fsel = NULL; cfdata->gui.fsel = NULL;
} }
static void static void
_cb_file_change(void *data) _cb_file_change(void *data)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
Evas_Object *icon; Evas_Object *icon;
cfdata = data; cfdata = data;
if (!cfdata) return; if (!cfdata) return;
if (!cfdata->file) return; if (!cfdata->file) return;
switch (cfdata->type) switch (cfdata->type)
{ {
case EDJ: case EDJ:
if (!strstr(cfdata->file, ".edj")) return; if (!strstr(cfdata->file, ".edj")) return;
@ -443,10 +443,10 @@ _cb_file_change(void *data)
IFFREE(cfdata->icon); IFFREE(cfdata->icon);
IFDUP(cfdata->file, cfdata->icon); IFDUP(cfdata->file, cfdata->icon);
if (cfdata->icon) if (cfdata->icon)
{ {
icon = _get_icon(cfdata); icon = _get_icon(cfdata);
if (icon) if (icon)
e_widget_button_icon_set(cfdata->gui.icon_wid, icon); e_widget_button_icon_set(cfdata->gui.icon_wid, icon);
} }
} }

6
src/modules/fileman/e_mod_main.c
View File

@ -87,7 +87,7 @@ e_modapi_init(E_Module *m)
e_fileman_dbus_init(); e_fileman_dbus_init();
e_fwin_nav_init(); e_fwin_nav_init();
return m; return m;
} }
@ -108,7 +108,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
e_fwin_zone_shutdown(zone); e_fwin_zone_shutdown(zone);
e_fwin_nav_shutdown(); e_fwin_nav_shutdown();
/* remove module-supplied menu additions */ /* remove module-supplied menu additions */
if (maug) if (maug)
{ {
@ -139,7 +139,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
e_object_del(E_OBJECT(cfd)); e_object_del(E_OBJECT(cfd));
while ((cfd = e_config_dialog_get("E", "fileman/fileman"))) while ((cfd = e_config_dialog_get("E", "fileman/fileman")))
e_object_del(E_OBJECT(cfd)); e_object_del(E_OBJECT(cfd));
e_configure_registry_item_del("fileman/file_icons"); e_configure_registry_item_del("fileman/file_icons");
e_configure_registry_item_del("fileman/fileman"); e_configure_registry_item_del("fileman/fileman");
e_configure_registry_category_del("fileman"); e_configure_registry_category_del("fileman");

2
src/modules/fileman/e_mod_menu.c
View File

@ -177,7 +177,7 @@ _e_mod_menu_populate_item(void *data, Eio_File *handler EINA_UNUSED, const Eina_
return; return;
} }
} }
if (eina_str_has_extension(info->path + info->name_start, "desktop")) if (eina_str_has_extension(info->path + info->name_start, "desktop"))
ed = efreet_desktop_get(info->path); ed = efreet_desktop_get(info->path);
if (ed) if (ed)