summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:31:20 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 14:17:13 +0200
commitbead80ca2335e7230eed5d9d65d6f9c35c1333cd (patch)
tree35b98d83d7e0eff57222e660c26ec9aa152f35e4 /src
parent0a9e0003d8c3cf7c9b26715423863e4033799183 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/modules/everything/evry_plug_apps.c10
-rw-r--r--src/modules/everything/evry_plug_calc.c8
-rw-r--r--src/modules/everything/evry_types.h6
-rw-r--r--src/modules/everything/evry_view.c12
-rw-r--r--src/modules/fileman/e_fwin.c34
-rw-r--r--src/modules/fileman/e_fwin_nav.c2
-rw-r--r--src/modules/fileman/e_int_config_mime.c2
-rw-r--r--src/modules/fileman/e_int_config_mime_edit.c126
-rw-r--r--src/modules/fileman/e_mod_main.c6
-rw-r--r--src/modules/fileman/e_mod_menu.c2
10 files changed, 104 insertions, 104 deletions
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index 3130a034c..fcc914b12 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -1512,7 +1512,7 @@ _scan_idler(void *data EINA_UNUSED)
1512 { 1512 {
1513 E_Exe *ee; 1513 E_Exe *ee;
1514 Eina_List *l, *l2 = exe_files; 1514 Eina_List *l, *l2 = exe_files;
1515 1515
1516 EINA_LIST_FOREACH(exe_list, l ,ee) 1516 EINA_LIST_FOREACH(exe_list, l ,ee)
1517 { 1517 {
1518 if (ee->path != l2->data) 1518 if (ee->path != l2->data)
@@ -1558,7 +1558,7 @@ _scan_idler(void *data EINA_UNUSED)
1558 1558
1559 e_config_domain_save(_exebuf_cache_file, exelist_edd, el); 1559 e_config_domain_save(_exebuf_cache_file, exelist_edd, el);
1560 INF("plugin exebuf save: %s, %d", _exebuf_cache_file, eina_list_count(el->list)); 1560 INF("plugin exebuf save: %s, %d", _exebuf_cache_file, eina_list_count(el->list));
1561 1561
1562 exe_list = el->list; 1562 exe_list = el->list;
1563 free(el); 1563 free(el);
1564 } 1564 }
@@ -1578,7 +1578,7 @@ _scan_idler(void *data EINA_UNUSED)
1578 dir = exe_path->data; 1578 dir = exe_path->data;
1579 exe_dir = eina_file_direct_ls(dir); 1579 exe_dir = eina_file_direct_ls(dir);
1580 INF("scan dir: %s", dir); 1580 INF("scan dir: %s", dir);
1581 1581
1582 } 1582 }
1583 /* if we have an opened dir - scan the next item */ 1583 /* if we have an opened dir - scan the next item */
1584 if (exe_dir) 1584 if (exe_dir)
@@ -1658,7 +1658,7 @@ _exe_path_list()
1658 } 1658 }
1659 if (pp > last) 1659 if (pp > last)
1660 exe_path = eina_list_append(exe_path, strdup(last)); 1660 exe_path = eina_list_append(exe_path, strdup(last));
1661 1661
1662 free(path); 1662 free(path);
1663 } 1663 }
1664 1664
@@ -1681,7 +1681,7 @@ _scan_executables()
1681 { 1681 {
1682 exe_list = el->list; 1682 exe_list = el->list;
1683 INF("plugin exebuf load: %s, %d", _exebuf_cache_file, eina_list_count(el->list)); 1683 INF("plugin exebuf load: %s, %d", _exebuf_cache_file, eina_list_count(el->list));
1684 1684
1685 free(el); 1685 free(el);
1686 } 1686 }
1687 1687
diff --git a/src/modules/everything/evry_plug_calc.c b/src/modules/everything/evry_plug_calc.c
index 9fe3f501e..1a506e863 100644
--- a/src/modules/everything/evry_plug_calc.c
+++ b/src/modules/everything/evry_plug_calc.c
@@ -79,16 +79,16 @@ _finish(Evry_Plugin *plugin)
79 79
80 if (it == cur_item) 80 if (it == cur_item)
81 cur_item = NULL; 81 cur_item = NULL;
82 82
83 EVRY_ITEM_FREE(it); 83 EVRY_ITEM_FREE(it);
84 } 84 }
85 85
86 if (cur_item) 86 if (cur_item)
87 { 87 {
88 EVRY_ITEM_FREE(cur_item); 88 EVRY_ITEM_FREE(cur_item);
89 cur_item = NULL; 89 cur_item = NULL;
90 } 90 }
91 91
92 EINA_LIST_FREE (handlers, h) 92 EINA_LIST_FREE (handlers, h)
93 ecore_event_handler_del(h); 93 ecore_event_handler_del(h);
94 94
@@ -177,7 +177,7 @@ _fetch(Evry_Plugin *plugin, const char *input)
177 eina_stringshare_del(result); 177 eina_stringshare_del(result);
178 } 178 }
179 } 179 }
180 180
181 if (!strncmp(input, "scale=", 6)) 181 if (!strncmp(input, "scale=", 6))
182 snprintf(buf, 1024, "%s\n", input); 182 snprintf(buf, 1024, "%s\n", input);
183 else 183 else
diff --git a/src/modules/everything/evry_types.h b/src/modules/everything/evry_types.h
index bfb2b31bb..8a305020a 100644
--- a/src/modules/everything/evry_types.h
+++ b/src/modules/everything/evry_types.h
@@ -51,7 +51,7 @@ struct _Evry_Item
51 51
52 /* optional */ 52 /* optional */
53 Evry_Type subtype; 53 Evry_Type subtype;
54 54
55 Evas_Object *(*icon_get) (Evry_Item *it, Evas *e); 55 Evas_Object *(*icon_get) (Evry_Item *it, Evas *e);
56 void (*free) (Evry_Item *it); 56 void (*free) (Evry_Item *it);
57 57
@@ -71,7 +71,7 @@ struct _Evry_Action
71 71
72 /* identifier */ 72 /* identifier */
73 const char *name; 73 const char *name;
74 74
75 struct 75 struct
76 { 76 {
77 /* requested type for action */ 77 /* requested type for action */
@@ -186,7 +186,7 @@ struct _Evry_Plugin
186 186
187 /* optional: list of Evry_Action that are specific for items of this plugin */ 187 /* optional: list of Evry_Action that are specific for items of this plugin */
188 Eina_List *actions; 188 Eina_List *actions;
189 189
190 /* optional: set type which the plugin can handle in 'begin' */ 190 /* optional: set type which the plugin can handle in 'begin' */
191 Evry_Type input_type; 191 Evry_Type input_type;
192 192
diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c
index 8800a0c74..59eada792 100644
--- a/src/modules/everything/evry_view.c
+++ b/src/modules/everything/evry_view.c
@@ -504,13 +504,13 @@ _e_smart_reconfigure_do(void *data)
504 sd->idle_enter = NULL; 504 sd->idle_enter = NULL;
505 return ECORE_CALLBACK_CANCEL; 505 return ECORE_CALLBACK_CANCEL;
506 } 506 }
507 507
508 if (sd->view->hiding) 508 if (sd->view->hiding)
509 { 509 {
510 sd->idle_enter = NULL; 510 sd->idle_enter = NULL;
511 return ECORE_CALLBACK_CANCEL; 511 return ECORE_CALLBACK_CANCEL;
512 } 512 }
513 513
514 if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w; 514 if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
515 if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h; 515 if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
516 if (sd->cx < 0) sd->cx = 0; 516 if (sd->cx < 0) sd->cx = 0;
@@ -958,9 +958,9 @@ _update_frame(Evas_Object *obj)
958 ecore_idle_enterer_del(sd->idle_enter); 958 ecore_idle_enterer_del(sd->idle_enter);
959 sd->idle_enter = NULL; 959 sd->idle_enter = NULL;
960 } 960 }
961 961
962 sd->place = EINA_TRUE; 962 sd->place = EINA_TRUE;
963 963
964 _e_smart_reconfigure_do(obj); 964 _e_smart_reconfigure_do(obj);
965 965
966 _pan_item_select(obj, sd->cur_item, 0); 966 _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
1471 } 1471 }
1472} 1472}
1473 1473
1474// FIXME: 'drag into' make mouse input hang after some trials 1474// FIXME: 'drag into' make mouse input hang after some trials
1475#if 0 1475#if 0
1476static void 1476static void
1477_view_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) 1477_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
1526 edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e"); 1526 edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");
1527 goto end; 1527 goto end;
1528 } 1528 }
1529 1529
1530 if ((sel->states->next) || (sel != sel->win->selectors[0])) 1530 if ((sel->states->next) || (sel != sel->win->selectors[0]))
1531 edje_object_signal_emit(sd->view->bg, "e,action,show,back", "e"); 1531 edje_object_signal_emit(sd->view->bg, "e,action,show,back", "e");
1532 1532
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index dbd855e2e..4c79264cf 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -52,7 +52,7 @@ struct _E_Fwin
52 Ecore_Timer *spring_close_timer; 52 Ecore_Timer *spring_close_timer;
53 E_Fwin *spring_parent; 53 E_Fwin *spring_parent;
54 E_Fwin *spring_child; 54 E_Fwin *spring_child;
55 55
56 Ecore_Event_Handler *zone_handler; 56 Ecore_Event_Handler *zone_handler;
57 Ecore_Event_Handler *zone_del_handler; 57 Ecore_Event_Handler *zone_del_handler;
58}; 58};
@@ -547,7 +547,7 @@ e_fwin_zone_shutdown(E_Zone *zone)
547{ 547{
548 Eina_List *f, *fn; 548 Eina_List *f, *fn;
549 E_Fwin *fwin; 549 E_Fwin *fwin;
550 550
551 551
552 EINA_LIST_FOREACH_SAFE(fwins, f, fn, fwin) 552 EINA_LIST_FOREACH_SAFE(fwins, f, fn, fwin)
553 { 553 {
@@ -746,7 +746,7 @@ _e_fwin_new(const char *dev,
746// o = e_icon_add(evas_object_evas_get(fwin->win)); 746// o = e_icon_add(evas_object_evas_get(fwin->win));
747// e_icon_scale_size_set(o, 0); 747// e_icon_scale_size_set(o, 0);
748// e_icon_fill_inside_set(o, 0); 748// e_icon_fill_inside_set(o, 0);
749 edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr), 749 edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr),
750 "e.swallow.overlay", o); 750 "e.swallow.overlay", o);
751 evas_object_pass_events_set(o, 1); 751 evas_object_pass_events_set(o, 1);
752 fwin->over_obj = o; 752 fwin->over_obj = o;
@@ -940,14 +940,14 @@ _e_fwin_icon_popup(void *data)
940 mw = zone->w * fileman_config->tooltip.size / 100.0; 940 mw = zone->w * fileman_config->tooltip.size / 100.0;
941 mh = zone->h * fileman_config->tooltip.size / 100.0; 941 mh = zone->h * fileman_config->tooltip.size / 100.0;
942 942
943 edje_object_part_text_set(bg, "e.text.title", 943 edje_object_part_text_set(bg, "e.text.title",
944 popup_icon->label ? 944 popup_icon->label ?
945 popup_icon->label : popup_icon->file); 945 popup_icon->label : popup_icon->file);
946 946
947 list = e_widget_list_add(e_comp->evas, 0, 0); 947 list = e_widget_list_add(e_comp->evas, 0, 0);
948 if (fwin->win) 948 if (fwin->win)
949 evas_object_event_callback_add(fwin->win, EVAS_CALLBACK_DEL, _e_fwin_popup_del, list); 949 evas_object_event_callback_add(fwin->win, EVAS_CALLBACK_DEL, _e_fwin_popup_del, list);
950 950
951 o = e_widget_filepreview_add(e_comp->evas, mw, mh, 0); 951 o = e_widget_filepreview_add(e_comp->evas, mw, mh, 0);
952 e_widget_filepreview_clamp_video_set(o, fileman_config->tooltip.clamp_size); 952 e_widget_filepreview_clamp_video_set(o, fileman_config->tooltip.clamp_size);
953 e_widget_filepreview_path_set(o, buf, popup_icon->mime); 953 e_widget_filepreview_path_set(o, buf, popup_icon->mime);
@@ -1065,7 +1065,7 @@ _e_fwin_page_favorites_add(E_Fwin_Page *page)
1065 e_fm2_pan_get, 1065 e_fm2_pan_get,
1066 e_fm2_pan_max_get, 1066 e_fm2_pan_max_get,
1067 e_fm2_pan_child_size_get); 1067 e_fm2_pan_child_size_get);
1068 e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o), 1068 e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o),
1069 "base/theme/fileman", 1069 "base/theme/fileman",
1070 "e/fileman/default/scrollframe"); 1070 "e/fileman/default/scrollframe");
1071 evas_object_propagate_events_set(page->flist, 0); 1071 evas_object_propagate_events_set(page->flist, 0);
@@ -1385,7 +1385,7 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop,
1385 E_Fwin *fwin = page->fwin; 1385 E_Fwin *fwin = page->fwin;
1386 E_Fm2_Icon_Info *ici; 1386 E_Fm2_Icon_Info *ici;
1387 char *file; 1387 char *file;
1388 1388
1389 skip_history = EINA_FALSE; 1389 skip_history = EINA_FALSE;
1390 1390
1391 selected = e_fm2_selected_list_get(page->fm_obj); 1391 selected = e_fm2_selected_list_get(page->fm_obj);
@@ -1868,7 +1868,7 @@ _e_fwin_changed(void *data,
1868 evas_object_hide(fwin->over_obj); 1868 evas_object_hide(fwin->over_obj);
1869 if (fwin->overlay_file) 1869 if (fwin->overlay_file)
1870 { 1870 {
1871 edje_object_file_set(fwin->over_obj, fwin->overlay_file, 1871 edje_object_file_set(fwin->over_obj, fwin->overlay_file,
1872 "e/desktop/background"); 1872 "e/desktop/background");
1873// ext = strrchr(fwin->overlay_file, '.'); 1873// ext = strrchr(fwin->overlay_file, '.');
1874// if (ext && !strcasecmp(ext, ".edj")) 1874// if (ext && !strcasecmp(ext, ".edj"))
@@ -2238,7 +2238,7 @@ _e_fwin_cb_menu_extend_start(void *data,
2238 2238
2239 mi = e_menu_item_new_relative(subm, mi); 2239 mi = e_menu_item_new_relative(subm, mi);
2240 e_menu_item_separator_set(mi, EINA_TRUE); 2240 e_menu_item_separator_set(mi, EINA_TRUE);
2241 2241
2242 mi = e_menu_item_new(m); 2242 mi = e_menu_item_new(m);
2243 e_menu_item_separator_set(mi, EINA_TRUE); 2243 e_menu_item_separator_set(mi, EINA_TRUE);
2244#endif 2244#endif
@@ -2247,7 +2247,7 @@ _e_fwin_cb_menu_extend_start(void *data,
2247 while (eina_list_count(selected) == 1) 2247 while (eina_list_count(selected) == 1)
2248 { 2248 {
2249 if (_e_fwin_file_is_exec(eina_list_data_get(selected)) == E_FWIN_EXEC_NONE) break; 2249 if (_e_fwin_file_is_exec(eina_list_data_get(selected)) == E_FWIN_EXEC_NONE) break;
2250 2250
2251 e_menu_item_label_set(mi, _("Run")); 2251 e_menu_item_label_set(mi, _("Run"));
2252 e_util_menu_item_theme_icon_set(mi, "system-run"); 2252 e_util_menu_item_theme_icon_set(mi, "system-run");
2253 set = EINA_TRUE; 2253 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,
2493 return NULL; 2493 return NULL;
2494 } 2494 }
2495 _e_fwin_border_set(page, fwin, ici); 2495 _e_fwin_border_set(page, fwin, ici);
2496 2496
2497 return fwin; 2497 return fwin;
2498} 2498}
2499 2499
@@ -2629,9 +2629,9 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
2629 dia = e_dialog_new(NULL, 2629 dia = e_dialog_new(NULL,
2630 "E", "_fwin_open_apps"); 2630 "E", "_fwin_open_apps");
2631 else return; /* make clang happy */ 2631 else return; /* make clang happy */
2632 2632
2633 e_dialog_resizable_set(dia, 1); 2633 e_dialog_resizable_set(dia, 1);
2634 2634
2635 fad = E_NEW(E_Fwin_Apps_Dialog, 1); 2635 fad = E_NEW(E_Fwin_Apps_Dialog, 1);
2636 e_dialog_title_set(dia, _("Open with...")); 2636 e_dialog_title_set(dia, _("Open with..."));
2637 e_dialog_button_add(dia, _("Open"), "document-open", 2637 e_dialog_button_add(dia, _("Open"), "document-open",
@@ -2812,7 +2812,7 @@ _e_fwin_file_open_dialog_cb_key_down(void *data,
2812 if (!strcmp(ev->key, "Escape")) 2812 if (!strcmp(ev->key, "Escape"))
2813 _e_fwin_cb_close(fwin->fad, fwin->fad->dia); 2813 _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
2814 else if ((!strcmp(ev->key, "Return")) || 2814 else if ((!strcmp(ev->key, "Return")) ||
2815 (!strcmp(ev->key, "KP_Enter"))) 2815 (!strcmp(ev->key, "KP_Enter")))
2816 _e_fwin_cb_open(fwin->fad, fwin->fad->dia); 2816 _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
2817} 2817}
2818 2818
@@ -3032,7 +3032,7 @@ _e_fwin_op_registry_listener_cb(void *data,
3032 char *total; 3032 char *total;
3033 int mw, mh; 3033 int mw, mh;
3034 Edje_Message_Float msg; 3034 Edje_Message_Float msg;
3035 3035
3036 // Don't show if the operation keep less than 1 second 3036 // Don't show if the operation keep less than 1 second
3037 if (ere->start_time + 1.0 > ecore_loop_time_get()) return; 3037 if (ere->start_time + 1.0 > ecore_loop_time_get()) return;
3038 3038
@@ -3146,7 +3146,7 @@ _e_fwin_op_registry_listener_cb(void *data,
3146 edje_object_signal_emit(o, "e,state,busy,start", "e"); 3146 edje_object_signal_emit(o, "e,state,busy,start", "e");
3147 } 3147 }
3148 } 3148 }
3149 3149
3150 // Update element 3150 // Update element
3151 edje_object_part_drag_size_set(o, "e.gauge.bar", 3151 edje_object_part_drag_size_set(o, "e.gauge.bar",
3152 ((double)(ere->percent)) / 100.0, 1.0); 3152 ((double)(ere->percent)) / 100.0, 1.0);
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index 4c6106cb6..b61c6f3ab 100644
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -97,7 +97,7 @@ _event_deleted(Nav_Item *ni, int type, void *e)
97 } 97 }
98 else 98 else
99 dir = ev->filename; 99 dir = ev->filename;
100 100
101 if (ni->path != dir) return ECORE_CALLBACK_RENEW; 101 if (ni->path != dir) return ECORE_CALLBACK_RENEW;
102 if (ni == ni->inst->sel_ni) 102 if (ni == ni->inst->sel_ni)
103 { 103 {
diff --git a/src/modules/fileman/e_int_config_mime.c b/src/modules/fileman/e_int_config_mime.c
index 64bb3f0ae..60f00e30b 100644
--- a/src/modules/fileman/e_int_config_mime.c
+++ b/src/modules/fileman/e_int_config_mime.c
@@ -165,7 +165,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
165 Evas_Object *ob; 165 Evas_Object *ob;
166 166
167 e_dialog_resizable_set(cfd->dia, 1); 167 e_dialog_resizable_set(cfd->dia, 1);
168 168
169 o = e_widget_list_add(evas, 1, 1); 169 o = e_widget_list_add(evas, 1, 1);
170 of = e_widget_framelist_add(evas, _("Categories"), 0); 170 of = e_widget_framelist_add(evas, _("Categories"), 0);
171 ol = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_type)); 171 ol = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_type));
diff --git a/src/modules/fileman/e_int_config_mime_edit.c b/src/modules/fileman/e_int_config_mime_edit.c
index d409a34cb..f3f405d73 100644
--- a/src/modules/fileman/e_int_config_mime_edit.c
+++ b/src/modules/fileman/e_int_config_mime_edit.c
@@ -15,7 +15,7 @@ static void _cb_fsel_cancel (void *data, E_Dialog *dia);
15static void _cb_file_change (void *data); 15static void _cb_file_change (void *data);
16 16
17typedef enum _Icon_Type Icon_Type; 17typedef enum _Icon_Type Icon_Type;
18enum _Icon_Type 18enum _Icon_Type
19{ 19{
20 THUMB, 20 THUMB,
21 THEME, 21 THEME,
@@ -24,14 +24,14 @@ enum _Icon_Type
24 DEFAULT 24 DEFAULT
25}; 25};
26 26
27struct _E_Config_Dialog_Data 27struct _E_Config_Dialog_Data
28{ 28{
29 char *mime; 29 char *mime;
30 char *icon; 30 char *icon;
31 int type; 31 int type;
32 32
33 char *file; 33 char *file;
34 struct 34 struct
35 { 35 {
36 Evas_Object *icon; 36 Evas_Object *icon;
37 Evas_Object *icon_wid, *fsel_wid; 37 Evas_Object *icon_wid, *fsel_wid;
@@ -45,18 +45,18 @@ struct _E_Config_Dialog_Data
45#define IFFREE(src) if (src) free(src); src = NULL; 45#define IFFREE(src) if (src) free(src); src = NULL;
46 46
47E_Config_Dialog * 47E_Config_Dialog *
48e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2) 48e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
49{ 49{
50 E_Config_Dialog *cfd; 50 E_Config_Dialog *cfd;
51 E_Config_Dialog_View *v; 51 E_Config_Dialog_View *v;
52 E_Config_Dialog_Data *cfdata; 52 E_Config_Dialog_Data *cfdata;
53 53
54 if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL; 54 if (e_config_dialog_find("E", "fileman/mime_edit_dialog")) return NULL;
55 55
56 cfdata = E_NEW(E_Config_Dialog_Data, 1); 56 cfdata = E_NEW(E_Config_Dialog_Data, 1);
57 cfdata->data = data; 57 cfdata->data = data;
58 cfdata->data2 = data2; 58 cfdata->data2 = data2;
59 59
60 v = E_NEW(E_Config_Dialog_View, 1); 60 v = E_NEW(E_Config_Dialog_View, 1);
61 v->create_cfdata = _create_data; 61 v->create_cfdata = _create_data;
62 v->free_cfdata = _free_data; 62 v->free_cfdata = _free_data;
@@ -64,21 +64,21 @@ e_int_config_mime_edit(E_Config_Mime_Icon *data, void *data2)
64 v->basic.check_changed = _basic_check; 64 v->basic.check_changed = _basic_check;
65 v->basic.apply_cfdata = _basic_apply; 65 v->basic.apply_cfdata = _basic_apply;
66 66
67 cfd = e_config_dialog_new(NULL, _("File Icon"), "E", 67 cfd = e_config_dialog_new(NULL, _("File Icon"), "E",
68 "fileman/mime_edit_dialog", 68 "fileman/mime_edit_dialog",
69 "preferences-file-icons", 0, v, cfdata); 69 "preferences-file-icons", 0, v, cfdata);
70 return cfd; 70 return cfd;
71} 71}
72 72
73static void * 73static void *
74_create_data(E_Config_Dialog *cfd) 74_create_data(E_Config_Dialog *cfd)
75{ 75{
76 _fill_data(cfd, cfd->data); 76 _fill_data(cfd, cfd->data);
77 return cfd->data; 77 return cfd->data;
78} 78}
79 79
80static void 80static void
81_fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 81_fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
82{ 82{
83 E_Config_Mime_Icon *mi; 83 E_Config_Mime_Icon *mi;
84 84
@@ -87,19 +87,19 @@ _fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
87 IFDUP(mi->mime, cfdata->mime); 87 IFDUP(mi->mime, cfdata->mime);
88 IFDUP(mi->icon, cfdata->icon); 88 IFDUP(mi->icon, cfdata->icon);
89 IFDUP(mi->icon, cfdata->file); 89 IFDUP(mi->icon, cfdata->file);
90 90
91 if (!cfdata->icon) 91 if (!cfdata->icon)
92 cfdata->type = DEFAULT; 92 cfdata->type = DEFAULT;
93 else 93 else
94 { 94 {
95 if (!strcmp(cfdata->icon, "THUMB")) 95 if (!strcmp(cfdata->icon, "THUMB"))
96 cfdata->type = THUMB; 96 cfdata->type = THUMB;
97 else if (!strncmp(cfdata->icon, "e/icons/fileman/mime", 20)) 97 else if (!strncmp(cfdata->icon, "e/icons/fileman/mime", 20))
98 cfdata->type = THEME; 98 cfdata->type = THEME;
99 else 99 else
100 { 100 {
101 char *p; 101 char *p;
102 102
103 p = strrchr(cfdata->icon, '.'); 103 p = strrchr(cfdata->icon, '.');
104 if ((p) && (!strcmp(p, ".edj"))) 104 if ((p) && (!strcmp(p, ".edj")))
105 cfdata->type = EDJ; 105 cfdata->type = EDJ;
@@ -110,11 +110,11 @@ _fill_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
110} 110}
111 111
112static void 112static void
113_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 113_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
114{ 114{
115 if (cfdata->gui.fsel) 115 if (cfdata->gui.fsel)
116 e_object_del(E_OBJECT(cfdata->gui.fsel)); 116 e_object_del(E_OBJECT(cfdata->gui.fsel));
117 117
118 IFFREE(cfdata->file); 118 IFFREE(cfdata->file);
119 IFFREE(cfdata->mime); 119 IFFREE(cfdata->mime);
120 IFFREE(cfdata->icon); 120 IFFREE(cfdata->icon);
@@ -123,12 +123,12 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
123} 123}
124 124
125static Evas_Object * 125static Evas_Object *
126_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 126_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
127{ 127{
128 Evas_Object *o, *of; 128 Evas_Object *o, *of;
129 Evas_Object *ob, *oi, *icon; 129 Evas_Object *ob, *oi, *icon;
130 E_Radio_Group *rg; 130 E_Radio_Group *rg;
131 131
132 o = e_widget_list_add(evas, 0, 0); 132 o = e_widget_list_add(evas, 0, 0);
133 133
134 of = e_widget_frametable_add(evas, _("Basic Info"), 0); 134 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)
139 e_widget_size_min_set(ob, 100, 1); 139 e_widget_size_min_set(ob, 100, 1);
140 e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); 140 e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
141 e_widget_list_object_append(o, of, 1, 1, 0.5); 141 e_widget_list_object_append(o, of, 1, 1, 0.5);
142 142
143 of = e_widget_frametable_add(evas, _("Icon"), 0); 143 of = e_widget_frametable_add(evas, _("Icon"), 0);
144 rg = e_widget_radio_group_new(&cfdata->type); 144 rg = e_widget_radio_group_new(&cfdata->type);
145 ob = e_widget_radio_add(evas, _("Use Generated Thumbnail"), 0, rg); 145 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)
160 160
161 oi = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd); 161 oi = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd);
162 cfdata->gui.icon_wid = oi; 162 cfdata->gui.icon_wid = oi;
163 if (cfdata->icon) 163 if (cfdata->icon)
164 { 164 {
165 icon = _get_icon(cfdata); 165 icon = _get_icon(cfdata);
166 if (icon) 166 if (icon)
167 e_widget_button_icon_set(oi, icon); 167 e_widget_button_icon_set(oi, icon);
168 } 168 }
169 e_widget_size_min_set(oi, 48, 48); 169 e_widget_size_min_set(oi, 48, 48);
170 e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1); 170 e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1);
171 e_widget_list_object_append(o, of, 1, 1, 0.5); 171 e_widget_list_object_append(o, of, 1, 1, 0.5);
172 172
173 switch (cfdata->type) 173 switch (cfdata->type)
174 { 174 {
175 case EDJ: 175 case EDJ:
176 case IMG: 176 case IMG:
@@ -180,7 +180,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
180 e_widget_disabled_set(cfdata->gui.icon_wid, 1); 180 e_widget_disabled_set(cfdata->gui.icon_wid, 1);
181 break; 181 break;
182 } 182 }
183 183
184 return o; 184 return o;
185} 185}
186 186
@@ -203,14 +203,14 @@ _basic_check(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
203} 203}
204 204
205static int 205static int
206_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 206_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
207{ 207{
208 Eina_List *l; 208 Eina_List *l;
209 E_Config_Mime_Icon *mi; 209 E_Config_Mime_Icon *mi;
210 char buf[4096]; 210 char buf[4096];
211 int found = 0; 211 int found = 0;
212 212
213 for (l = e_config->mime_icons; l; l = l->next) 213 for (l = e_config->mime_icons; l; l = l->next)
214 { 214 {
215 mi = l->data; 215 mi = l->data;
216 if (!mi) continue; 216 if (!mi) continue;
@@ -218,20 +218,20 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
218 found = 1; 218 found = 1;
219 break; 219 break;
220 } 220 }
221 221
222 if (found) 222 if (found)
223 { 223 {
224 if (mi->icon) 224 if (mi->icon)
225 eina_stringshare_del(mi->icon); 225 eina_stringshare_del(mi->icon);
226 } 226 }
227 else 227 else
228 { 228 {
229 if (cfdata->type == DEFAULT) return 1; 229 if (cfdata->type == DEFAULT) return 1;
230 mi = E_NEW(E_Config_Mime_Icon, 1); 230 mi = E_NEW(E_Config_Mime_Icon, 1);
231 mi->mime = eina_stringshare_add(cfdata->mime); 231 mi->mime = eina_stringshare_add(cfdata->mime);
232 } 232 }
233 233
234 switch (cfdata->type) 234 switch (cfdata->type)
235 { 235 {
236 case THUMB: 236 case THUMB:
237 mi->icon = eina_stringshare_add("THUMB"); 237 mi->icon = eina_stringshare_add("THUMB");
@@ -257,7 +257,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
257 257
258 if (!found) 258 if (!found)
259 e_config->mime_icons = eina_list_append(e_config->mime_icons, mi); 259 e_config->mime_icons = eina_list_append(e_config->mime_icons, mi);
260 260
261 e_config_save_queue(); 261 e_config_save_queue();
262 e_fm_mime_icon_cache_flush(); 262 e_fm_mime_icon_cache_flush();
263 e_fm2_all_icons_update(); 263 e_fm2_all_icons_update();
@@ -275,22 +275,22 @@ _dia_del(void *data)
275 cfdata->gui.fsel = NULL; 275 cfdata->gui.fsel = NULL;
276} 276}
277 277
278static void 278static void
279_cb_icon_sel(void *data, void *data2) 279_cb_icon_sel(void *data, void *data2)
280{ 280{
281 E_Config_Dialog_Data *cfdata; 281 E_Config_Dialog_Data *cfdata;
282 E_Config_Dialog *cfd; 282 E_Config_Dialog *cfd;
283 E_Dialog *dia; 283 E_Dialog *dia;
284 Evas_Object *o; 284 Evas_Object *o;
285 Evas_Coord w, h; 285 Evas_Coord w, h;
286 286
287 cfdata = data; 287 cfdata = data;
288 if (!cfdata) return; 288 if (!cfdata) return;
289 if (cfdata->gui.fsel) return; 289 if (cfdata->gui.fsel) return;
290 290
291 cfd = data2; 291 cfd = data2;
292 if (!cfd) return; 292 if (!cfd) return;
293 293
294 dia = e_dialog_new(NULL, "E", "_mime_icon_select_dialog"); 294 dia = e_dialog_new(NULL, "E", "_mime_icon_select_dialog");
295 if (!dia) return; 295 if (!dia) return;
296 if (cfdata->type == EDJ) 296 if (cfdata->type == EDJ)
@@ -299,7 +299,7 @@ _cb_icon_sel(void *data, void *data2)
299 e_dialog_title_set(dia, _("Select an image")); 299 e_dialog_title_set(dia, _("Select an image"));
300 300
301 e_dialog_resizable_set(dia, 1); 301 e_dialog_resizable_set(dia, 1);
302 302
303 dia->data = cfdata; 303 dia->data = cfdata;
304 e_object_del_attach_func_set(E_OBJECT(dia), _dia_del); 304 e_object_del_attach_func_set(E_OBJECT(dia), _dia_del);
305 o = e_widget_fsel_add(evas_object_evas_get(dia->win), "~/", "/", NULL, NULL, 305 o = e_widget_fsel_add(evas_object_evas_get(dia->win), "~/", "/", NULL, NULL,
@@ -309,24 +309,24 @@ _cb_icon_sel(void *data, void *data2)
309 evas_object_show(o); 309 evas_object_show(o);
310 e_widget_size_min_get(o, &w, &h); 310 e_widget_size_min_get(o, &w, &h);
311 e_dialog_content_set(dia, o, w, h); 311 e_dialog_content_set(dia, o, w, h);
312 312
313 e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata); 313 e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
314 e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata); 314 e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata);
315 elm_win_center(dia->win, 1, 1); 315 elm_win_center(dia->win, 1, 1);
316 e_dialog_show(dia); 316 e_dialog_show(dia);
317 e_dialog_border_icon_set(dia, "enlightenment/file_icons"); 317 e_dialog_border_icon_set(dia, "enlightenment/file_icons");
318 318
319 cfdata->gui.fsel = dia; 319 cfdata->gui.fsel = dia;
320} 320}
321 321
322static Evas_Object * 322static Evas_Object *
323_get_icon(void *data) 323_get_icon(void *data)
324{ 324{
325 Evas *evas; 325 Evas *evas;
326 E_Config_Dialog_Data *cfdata; 326 E_Config_Dialog_Data *cfdata;
327 Evas_Object *icon = NULL; 327 Evas_Object *icon = NULL;
328 char buf[4096]; 328 char buf[4096];
329 329
330 cfdata = data; 330 cfdata = data;
331 if (!cfdata) return NULL; 331 if (!cfdata) return NULL;
332 332
@@ -334,11 +334,11 @@ _get_icon(void *data)
334 if (cfdata->gui.icon) 334 if (cfdata->gui.icon)
335 evas_object_del(cfdata->gui.icon); 335 evas_object_del(cfdata->gui.icon);
336 cfdata->gui.icon = NULL; 336 cfdata->gui.icon = NULL;
337 337
338 if (cfdata->type == DEFAULT) return NULL; 338 if (cfdata->type == DEFAULT) return NULL;
339 339
340 evas = evas_object_evas_get(cfdata->gui.icon_wid); 340 evas = evas_object_evas_get(cfdata->gui.icon_wid);
341 switch (cfdata->type) 341 switch (cfdata->type)
342 { 342 {
343 case THUMB: 343 case THUMB:
344 icon = edje_object_add(evas); 344 icon = edje_object_add(evas);
@@ -362,19 +362,19 @@ _get_icon(void *data)
362 default: 362 default:
363 break; 363 break;
364 } 364 }
365 365
366 cfdata->gui.icon = icon; 366 cfdata->gui.icon = icon;
367 return icon; 367 return icon;
368} 368}
369 369
370static void 370static void
371_cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 371_cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
372{ 372{
373 E_Config_Dialog_Data *cfdata; 373 E_Config_Dialog_Data *cfdata;
374 374
375 cfdata = data; 375 cfdata = data;
376 if (!cfdata) return; 376 if (!cfdata) return;
377 switch (cfdata->type) 377 switch (cfdata->type)
378 { 378 {
379 case EDJ: 379 case EDJ:
380 case IMG: 380 case IMG:
@@ -386,24 +386,24 @@ _cb_type(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
386 } 386 }
387} 387}
388 388
389static void 389static void
390_cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED) 390_cb_fsel_sel(void *data, Evas_Object *obj EINA_UNUSED)
391{ 391{
392 E_Config_Dialog_Data *cfdata; 392 E_Config_Dialog_Data *cfdata;
393 393
394 cfdata = data; 394 cfdata = data;
395 if (!cfdata) return; 395 if (!cfdata) return;
396} 396}
397 397
398static void 398static void
399_cb_fsel_ok(void *data, E_Dialog *dia) 399_cb_fsel_ok(void *data, E_Dialog *dia)
400{ 400{
401 E_Config_Dialog_Data *cfdata; 401 E_Config_Dialog_Data *cfdata;
402 const char *file; 402 const char *file;
403 403
404 cfdata = data; 404 cfdata = data;
405 if (!cfdata) return; 405 if (!cfdata) return;
406 406
407 file = e_widget_fsel_selection_path_get(cfdata->gui.fsel_wid); 407 file = e_widget_fsel_selection_path_get(cfdata->gui.fsel_wid);
408 IFFREE(cfdata->file); 408 IFFREE(cfdata->file);
409 IFDUP(file, cfdata->file); 409 IFDUP(file, cfdata->file);
@@ -412,26 +412,26 @@ _cb_fsel_ok(void *data, E_Dialog *dia)
412 _cb_file_change(cfdata); 412 _cb_file_change(cfdata);
413} 413}
414 414
415static void 415static void
416_cb_fsel_cancel(void *data, E_Dialog *dia) 416_cb_fsel_cancel(void *data, E_Dialog *dia)
417{ 417{
418 E_Config_Dialog_Data *cfdata; 418 E_Config_Dialog_Data *cfdata;
419 419
420 cfdata = data; 420 cfdata = data;
421 e_object_del(E_OBJECT(dia)); 421 e_object_del(E_OBJECT(dia));
422 cfdata->gui.fsel = NULL; 422 cfdata->gui.fsel = NULL;
423} 423}
424 424
425static void 425static void
426_cb_file_change(void *data) 426_cb_file_change(void *data)
427{ 427{
428 E_Config_Dialog_Data *cfdata; 428 E_Config_Dialog_Data *cfdata;
429 Evas_Object *icon; 429 Evas_Object *icon;
430 430
431 cfdata = data; 431 cfdata = data;
432 if (!cfdata) return; 432 if (!cfdata) return;
433 if (!cfdata->file) return; 433 if (!cfdata->file) return;
434 switch (cfdata->type) 434 switch (cfdata->type)
435 { 435 {
436 case EDJ: 436 case EDJ:
437 if (!strstr(cfdata->file, ".edj")) return; 437 if (!strstr(cfdata->file, ".edj")) return;
@@ -443,10 +443,10 @@ _cb_file_change(void *data)
443 IFFREE(cfdata->icon); 443 IFFREE(cfdata->icon);
444 IFDUP(cfdata->file, cfdata->icon); 444 IFDUP(cfdata->file, cfdata->icon);
445 445
446 if (cfdata->icon) 446 if (cfdata->icon)
447 { 447 {
448 icon = _get_icon(cfdata); 448 icon = _get_icon(cfdata);
449 if (icon) 449 if (icon)
450 e_widget_button_icon_set(cfdata->gui.icon_wid, icon); 450 e_widget_button_icon_set(cfdata->gui.icon_wid, icon);
451 } 451 }
452} 452}
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index f408d320b..9a40731b3 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -87,7 +87,7 @@ e_modapi_init(E_Module *m)
87 e_fileman_dbus_init(); 87 e_fileman_dbus_init();
88 88
89 e_fwin_nav_init(); 89 e_fwin_nav_init();
90 90
91 return m; 91 return m;
92} 92}
93 93
@@ -108,7 +108,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
108 e_fwin_zone_shutdown(zone); 108 e_fwin_zone_shutdown(zone);
109 109
110 e_fwin_nav_shutdown(); 110 e_fwin_nav_shutdown();
111 111
112 /* remove module-supplied menu additions */ 112 /* remove module-supplied menu additions */
113 if (maug) 113 if (maug)
114 { 114 {
@@ -139,7 +139,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
139 e_object_del(E_OBJECT(cfd)); 139 e_object_del(E_OBJECT(cfd));
140 while ((cfd = e_config_dialog_get("E", "fileman/fileman"))) 140 while ((cfd = e_config_dialog_get("E", "fileman/fileman")))
141 e_object_del(E_OBJECT(cfd)); 141 e_object_del(E_OBJECT(cfd));
142 142
143 e_configure_registry_item_del("fileman/file_icons"); 143 e_configure_registry_item_del("fileman/file_icons");
144 e_configure_registry_item_del("fileman/fileman"); 144 e_configure_registry_item_del("fileman/fileman");
145 e_configure_registry_category_del("fileman"); 145 e_configure_registry_category_del("fileman");
diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c
index ed73d1fe6..e4446b375 100644
--- a/src/modules/fileman/e_mod_menu.c
+++ b/src/modules/fileman/e_mod_menu.c
@@ -177,7 +177,7 @@ _e_mod_menu_populate_item(void *data, Eio_File *handler EINA_UNUSED, const Eina_
177 return; 177 return;
178 } 178 }
179 } 179 }
180 180
181 if (eina_str_has_extension(info->path + info->name_start, "desktop")) 181 if (eina_str_has_extension(info->path + info->name_start, "desktop"))
182 ed = efreet_desktop_get(info->path); 182 ed = efreet_desktop_get(info->path);
183 if (ed) 183 if (ed)