ecrustified for formatting

SVN revision: 55908
This commit is contained in:
Mike Blumenkrantz 2011-01-05 22:36:21 +00:00
parent 7aff5821e4
commit 346e271e07
4 changed files with 1533 additions and 1329 deletions

View File

@ -81,61 +81,133 @@ typedef enum
} E_Fwin_Exec_Type; } E_Fwin_Exec_Type;
/* local subsystem prototypes */ /* local subsystem prototypes */
static E_Fwin *_e_fwin_new(E_Container *con, const char *dev, const char *path); static E_Fwin *_e_fwin_new(E_Container *con,
const char *dev,
const char *path);
static void _e_fwin_free(E_Fwin *fwin); static void _e_fwin_free(E_Fwin *fwin);
static E_Fwin_Page *_e_fwin_page_create(E_Fwin *fwin); static E_Fwin_Page *_e_fwin_page_create(E_Fwin *fwin);
static void _e_fwin_page_free(E_Fwin_Page *page); static void _e_fwin_page_free(E_Fwin_Page *page);
static void _e_fwin_page_new(E_Fwin *fwin); static void _e_fwin_page_new(E_Fwin *fwin);
static void _e_fwin_cb_page_change(void *data1, void *data2); static void _e_fwin_cb_page_change(void *data1,
void *data2);
static void _e_fwin_cb_delete(E_Win *win); static void _e_fwin_cb_delete(E_Win *win);
static void _e_fwin_cb_move(E_Win *win); static void _e_fwin_cb_move(E_Win *win);
static void _e_fwin_cb_resize(E_Win *win); static void _e_fwin_cb_resize(E_Win *win);
static void _e_fwin_deleted(void *data, Evas_Object *obj, void *event_info); static void _e_fwin_deleted(void *data,
static const char *_e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev_path, const char *key); Evas_Object *obj,
static void _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_history); void *event_info);
static Eina_List *_e_fwin_suggested_apps_list_get(Eina_List *files, Eina_List **mime_list); static const char *_e_fwin_custom_file_path_eval(E_Fwin *fwin,
static void _e_fwin_changed(void *data, Evas_Object *obj, void *event_info); Efreet_Desktop *ef,
static void _e_fwin_selected(void *data, Evas_Object *obj, void *event_info); const char *prev_path,
static void _e_fwin_selection_change(void *data, Evas_Object *obj, void *event_info); const char *key);
static void _e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info); static void _e_fwin_desktop_run(Efreet_Desktop *desktop,
static void _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m); E_Fwin_Page *page,
static void _e_fwin_cb_menu_open_fast(void *data, E_Menu *m, E_Menu_Item *mi); Eina_Bool skip_history);
static void _e_fwin_parent(void *data, E_Menu *m, E_Menu_Item *mi); static Eina_List *_e_fwin_suggested_apps_list_get(Eina_List *files,
static void _e_fwin_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info); Eina_List **mime_list);
static void _e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info); static void _e_fwin_changed(void *data,
static void _e_fwin_cb_menu_open(void *data, E_Menu *m, E_Menu_Item *mi); Evas_Object *obj,
static void _e_fwin_cb_menu_open_with(void *data, E_Menu *m, E_Menu_Item *mi); void *event_info);
static void _e_fwin_cb_all_change(void *data, Evas_Object *obj); static void _e_fwin_selected(void *data,
static void _e_fwin_cb_exec_cmd_changed(void *data, void *data2); Evas_Object *obj,
static void _e_fwin_cb_open(void *data, E_Dialog *dia); void *event_info);
static void _e_fwin_cb_close(void *data, E_Dialog *dia); static void _e_fwin_selection_change(void *data,
Evas_Object *obj,
void *event_info);
static void _e_fwin_menu_extend(void *data,
Evas_Object *obj,
E_Menu *m,
E_Fm2_Icon_Info *info);
static void _e_fwin_cb_menu_extend_open_with(void *data,
E_Menu *m);
static void _e_fwin_cb_menu_open_fast(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_fwin_parent(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_fwin_cb_key_down(void *data,
Evas *e,
Evas_Object *obj,
void *event_info);
static void _e_fwin_cb_menu_extend_start(void *data,
Evas_Object *obj,
E_Menu *m,
E_Fm2_Icon_Info *info);
static void _e_fwin_cb_menu_open(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_fwin_cb_menu_open_with(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_fwin_cb_all_change(void *data,
Evas_Object *obj);
static void _e_fwin_cb_exec_cmd_changed(void *data,
void *data2);
static void _e_fwin_cb_open(void *data,
E_Dialog *dia);
static void _e_fwin_cb_close(void *data,
E_Dialog *dia);
static void _e_fwin_cb_dialog_free(void *obj); static void _e_fwin_cb_dialog_free(void *obj);
static Eina_Bool _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata); static Eina_Bool _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__,
const void *key,
void *data __UNUSED__,
void *fdata);
static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici); static E_Fwin_Exec_Type _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici);
static void _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext); static void _e_fwin_file_exec(E_Fwin_Page *page,
static void _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always); E_Fm2_Icon_Info *ici,
static void _e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info); E_Fwin_Exec_Type ext);
static void _e_fwin_file_open_dialog(E_Fwin_Page *page,
Eina_List *files,
int always);
static void _e_fwin_file_open_dialog_cb_key_down(void *data,
Evas *e,
Evas_Object *obj,
void *event_info);
static void _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); static void _e_fwin_pan_set(Evas_Object *obj,
static void _e_fwin_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); Evas_Coord x,
static void _e_fwin_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); Evas_Coord y);
static void _e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); static void _e_fwin_pan_get(Evas_Object *obj,
Evas_Coord *x,
Evas_Coord *y);
static void _e_fwin_pan_max_get(Evas_Object *obj,
Evas_Coord *x,
Evas_Coord *y);
static void _e_fwin_pan_child_size_get(Evas_Object *obj,
Evas_Coord *w,
Evas_Coord *h);
static void _e_fwin_pan_scroll_update(E_Fwin_Page *page); static void _e_fwin_pan_scroll_update(E_Fwin_Page *page);
static void _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); static void _e_fwin_zone_cb_mouse_down(void *data,
static Eina_Bool _e_fwin_zone_move_resize(void *data, int type, void *event); Evas *evas,
static Eina_Bool _e_fwin_zone_del(void *data, int type, void *event); Evas_Object *obj,
void *event_info);
static Eina_Bool _e_fwin_zone_move_resize(void *data,
int type,
void *event);
static Eina_Bool _e_fwin_zone_del(void *data,
int type,
void *event);
static void _e_fwin_config_set(E_Fwin_Page *page); static void _e_fwin_config_set(E_Fwin_Page *page);
static void _e_fwin_window_title_set(E_Fwin_Page *page); static void _e_fwin_window_title_set(E_Fwin_Page *page);
static void _e_fwin_page_resize(E_Fwin_Page *page); static void _e_fwin_page_resize(E_Fwin_Page *page);
static void _e_fwin_toolbar_resize(E_Fwin_Page *page); static void _e_fwin_toolbar_resize(E_Fwin_Page *page);
static int _e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2); static int _e_fwin_dlg_cb_desk_sort(const void *p1,
static int _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2); const void *p2);
static int _e_fwin_dlg_cb_desk_list_sort(const void *data1,
const void *data2);
static void _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere); static void _e_fwin_op_registry_listener_cb(void *data,
static Eina_Bool _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event); const E_Fm2_Op_Registry_Entry *ere);
static Eina_Bool _e_fwin_op_registry_entry_add_cb(void *data,
int type,
void *event);
static void _e_fwin_op_registry_entry_iter(E_Fwin_Page *page); static void _e_fwin_op_registry_entry_iter(E_Fwin_Page *page);
static void _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission, const char *source); static void _e_fwin_op_registry_abort_cb(void *data,
Evas_Object *obj,
const char *emission,
const char *source);
/* local subsystem globals */ /* local subsystem globals */
static Eina_List *fwins = NULL; static Eina_List *fwins = NULL;
@ -166,13 +238,17 @@ e_fwin_shutdown(void)
* "fwin" window * "fwin" window
*/ */
void void
e_fwin_new(E_Container *con, const char *dev, const char *path) e_fwin_new(E_Container *con,
const char *dev,
const char *path)
{ {
_e_fwin_new(con, dev, path); _e_fwin_new(con, dev, path);
} }
void void
e_fwin_zone_new(E_Zone *zone, const char *dev, const char *path) e_fwin_zone_new(E_Zone *zone,
const char *dev,
const char *path)
{ {
E_Fwin *fwin; E_Fwin *fwin;
E_Fwin_Page *page; E_Fwin_Page *page;
@ -352,10 +428,11 @@ e_fwin_zone_find(E_Zone *zone)
return 0; return 0;
} }
/* local subsystem functions */ /* local subsystem functions */
static E_Fwin * static E_Fwin *
_e_fwin_new(E_Container *con, const char *dev, const char *path) _e_fwin_new(E_Container *con,
const char *dev,
const char *path)
{ {
E_Fwin *fwin; E_Fwin *fwin;
E_Fwin_Page *page; E_Fwin_Page *page;
@ -583,7 +660,8 @@ _e_fwin_page_new(E_Fwin *fwin)
} }
static void static void
_e_fwin_cb_page_change(void *data1, void *data2) _e_fwin_cb_page_change(void *data1,
void *data2)
{ {
E_Fwin *fwin = data1; E_Fwin *fwin = data1;
E_Fwin_Page *page = data2, *prev; E_Fwin_Page *page = data2, *prev;
@ -608,7 +686,10 @@ _e_fwin_cb_page_change(void *data1, void *data2)
} }
static const char * static const char *
_e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev_path, const char *key) _e_fwin_custom_file_path_eval(E_Fwin *fwin,
Efreet_Desktop *ef,
const char *prev_path,
const char *key)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
const char *res, *ret = NULL; const char *res, *ret = NULL;
@ -634,7 +715,8 @@ _e_fwin_custom_file_path_eval(E_Fwin *fwin, Efreet_Desktop *ef, const char *prev
} }
static Eina_List * static Eina_List *
_e_fwin_suggested_apps_list_get(Eina_List *files, Eina_List **mime_list) _e_fwin_suggested_apps_list_get(Eina_List *files,
Eina_List **mime_list)
{ {
E_Fm2_Icon_Info *ici; E_Fm2_Icon_Info *ici;
const char *f = NULL; const char *f = NULL;
@ -679,14 +761,16 @@ _e_fwin_suggested_apps_list_get(Eina_List *files, Eina_List **mime_list)
if (mime_list) if (mime_list)
*mime_list = mlist; *mime_list = mlist;
else else
if (mlist) mlist = eina_list_free(mlist); if (mlist)
mlist = eina_list_free(mlist);
return ret; return ret;
} }
static void static void
_e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_history) _e_fwin_desktop_run(Efreet_Desktop *desktop,
E_Fwin_Page *page,
Eina_Bool skip_history)
{ {
char pcwd[4096], buf[4096]; char pcwd[4096], buf[4096];
Eina_List *selected, *l, *files = NULL; Eina_List *selected, *l, *files = NULL;
@ -738,7 +822,10 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop, E_Fwin_Page *page, Eina_Bool skip_h
} }
static Eina_Bool static Eina_Bool
_e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata) _e_fwin_cb_hash_foreach(const Eina_Hash *hash __UNUSED__,
const void *key,
void *data __UNUSED__,
void *fdata)
{ {
Eina_List **mlist; Eina_List **mlist;
@ -815,7 +902,9 @@ _e_fwin_file_is_exec(E_Fm2_Icon_Info *ici)
} }
static void static void
_e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext) _e_fwin_file_exec(E_Fwin_Page *page,
E_Fm2_Icon_Info *ici,
E_Fwin_Exec_Type ext)
{ {
E_Fwin *fwin = page->fwin; E_Fwin *fwin = page->fwin;
char buf[4096]; char buf[4096];
@ -827,12 +916,14 @@ _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
{ {
case E_FWIN_EXEC_NONE: case E_FWIN_EXEC_NONE:
break; break;
case E_FWIN_EXEC_DIRECT: case E_FWIN_EXEC_DIRECT:
if (fwin->win) if (fwin->win)
e_exec(fwin->win->border->zone, NULL, ici->file, NULL, "fwin"); e_exec(fwin->win->border->zone, NULL, ici->file, NULL, "fwin");
else if (fwin->zone) else if (fwin->zone)
e_exec(fwin->zone, NULL, ici->file, NULL, "fwin"); e_exec(fwin->zone, NULL, ici->file, NULL, "fwin");
break; break;
case E_FWIN_EXEC_SH: case E_FWIN_EXEC_SH:
snprintf(buf, sizeof(buf), "/bin/sh %s", e_util_filename_escape(ici->file)); snprintf(buf, sizeof(buf), "/bin/sh %s", e_util_filename_escape(ici->file));
if (fwin->win) if (fwin->win)
@ -840,6 +931,7 @@ _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
else if (fwin->zone) else if (fwin->zone)
e_exec(fwin->zone, NULL, buf, NULL, NULL); e_exec(fwin->zone, NULL, buf, NULL, NULL);
break; break;
case E_FWIN_EXEC_TERMINAL_DIRECT: case E_FWIN_EXEC_TERMINAL_DIRECT:
snprintf(buf, sizeof(buf), "%s %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file)); snprintf(buf, sizeof(buf), "%s %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file));
if (fwin->win) if (fwin->win)
@ -847,6 +939,7 @@ _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
else if (fwin->zone) else if (fwin->zone)
e_exec(fwin->zone, NULL, buf, NULL, NULL); e_exec(fwin->zone, NULL, buf, NULL, NULL);
break; break;
case E_FWIN_EXEC_TERMINAL_SH: case E_FWIN_EXEC_TERMINAL_SH:
snprintf(buf, sizeof(buf), "%s /bin/sh %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file)); snprintf(buf, sizeof(buf), "%s /bin/sh %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file));
if (fwin->win) if (fwin->win)
@ -854,6 +947,7 @@ _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
else if (fwin->zone) else if (fwin->zone)
e_exec(fwin->zone, NULL, buf, NULL, NULL); e_exec(fwin->zone, NULL, buf, NULL, NULL);
break; break;
case E_FWIN_EXEC_DESKTOP: case E_FWIN_EXEC_DESKTOP:
snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(page->fm_obj), ici->file); snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(page->fm_obj), ici->file);
desktop = efreet_desktop_new(buf); desktop = efreet_desktop_new(buf);
@ -866,6 +960,7 @@ _e_fwin_file_exec(E_Fwin_Page *page, E_Fm2_Icon_Info *ici, E_Fwin_Exec_Type ext)
efreet_desktop_free(desktop); efreet_desktop_free(desktop);
} }
break; break;
default: default:
break; break;
} }
@ -986,6 +1081,7 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page)
y = offset + th; y = offset + th;
h = (h - offset - th); h = (h - offset - th);
break; break;
case E_GADCON_ORIENT_BOTTOM: case E_GADCON_ORIENT_BOTTOM:
tx = 0; tx = 0;
th = 32; th = 32;
@ -996,6 +1092,7 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page)
y = offset; y = offset;
h = (h - offset - th); h = (h - offset - th);
break; break;
case E_GADCON_ORIENT_VERT: case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT: case E_GADCON_ORIENT_LEFT:
tx = 0; tx = 0;
@ -1007,6 +1104,7 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page)
y = offset; y = offset;
w = (w - tw); w = (w - tw);
break; break;
case E_GADCON_ORIENT_RIGHT: case E_GADCON_ORIENT_RIGHT:
ty = offset; ty = offset;
tw = 32; tw = 32;
@ -1017,6 +1115,7 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page)
y = offset; y = offset;
w = (w - tw); w = (w - tw);
break; break;
default: default:
return; return;
} }
@ -1025,7 +1124,6 @@ _e_fwin_toolbar_resize(E_Fwin_Page *page)
evas_object_resize(page->scrollframe_obj, w, h); evas_object_resize(page->scrollframe_obj, w, h);
} }
/* fwin callbacks */ /* fwin callbacks */
static void static void
_e_fwin_cb_delete(E_Win *win) _e_fwin_cb_delete(E_Win *win)
@ -1104,7 +1202,9 @@ _e_fwin_cb_resize(E_Win *win)
} }
static void static void
_e_fwin_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _e_fwin_deleted(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
@ -1113,7 +1213,9 @@ _e_fwin_deleted(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS
} }
static void static void
_e_fwin_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__) _e_fwin_changed(void *data,
Evas_Object *obj,
void *event_info __UNUSED__)
{ {
E_Fwin *fwin; E_Fwin *fwin;
E_Fwin_Page *page; E_Fwin_Page *page;
@ -1139,7 +1241,8 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
} }
else else
{ {
#define RELEASE_STR(x) if (x) { eina_stringshare_del(x); (x) = NULL; } #define RELEASE_STR(x) if (x) { eina_stringshare_del(x); (x) = NULL; \
}
RELEASE_STR(fwin->wallpaper_file); RELEASE_STR(fwin->wallpaper_file);
RELEASE_STR(fwin->overlay_file); RELEASE_STR(fwin->overlay_file);
RELEASE_STR(fwin->scrollframe_file); RELEASE_STR(fwin->scrollframe_file);
@ -1213,7 +1316,9 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
} }
static void static void
_e_fwin_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _e_fwin_selected(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
Eina_List *selected; Eina_List *selected;
@ -1226,7 +1331,9 @@ _e_fwin_selected(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
} }
static void static void
_e_fwin_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _e_fwin_selection_change(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{ {
Eina_List *l; Eina_List *l;
E_Fwin_Page *page; E_Fwin_Page *page;
@ -1240,7 +1347,8 @@ _e_fwin_selection_change(void *data, Evas_Object *obj __UNUSED__, void *event_in
} }
static void static void
_e_fwin_cb_all_change(void *data, Evas_Object *obj __UNUSED__) _e_fwin_cb_all_change(void *data,
Evas_Object *obj __UNUSED__)
{ {
E_Fwin_Apps_Dialog *fad; E_Fwin_Apps_Dialog *fad;
Efreet_Desktop *desktop = NULL; Efreet_Desktop *desktop = NULL;
@ -1254,7 +1362,10 @@ _e_fwin_cb_all_change(void *data, Evas_Object *obj __UNUSED__)
} }
static void static void
_e_fwin_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) _e_fwin_cb_key_down(void *data,
Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info)
{ {
Evas_Event_Key_Down *ev; Evas_Event_Key_Down *ev;
E_Fwin *fwin; E_Fwin *fwin;
@ -1372,10 +1483,12 @@ _e_fwin_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
} }
} }
/* fwin zone callbacks */ /* fwin zone callbacks */
static void static void
_e_fwin_zone_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) _e_fwin_zone_cb_mouse_down(void *data,
Evas *evas __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{ {
E_Fwin *fwin; E_Fwin *fwin;
@ -1385,7 +1498,9 @@ _e_fwin_zone_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj _
} }
static Eina_Bool static Eina_Bool
_e_fwin_zone_move_resize(void *data, int type, void *event) _e_fwin_zone_move_resize(void *data,
int type,
void *event)
{ {
E_Event_Zone_Move_Resize *ev; E_Event_Zone_Move_Resize *ev;
E_Fwin *fwin; E_Fwin *fwin;
@ -1411,7 +1526,9 @@ _e_fwin_zone_move_resize(void *data, int type, void *event)
} }
static Eina_Bool static Eina_Bool
_e_fwin_zone_del(void *data, int type, void *event) _e_fwin_zone_del(void *data,
int type,
void *event)
{ {
E_Event_Zone_Del *ev; E_Event_Zone_Del *ev;
E_Fwin *fwin; E_Fwin *fwin;
@ -1425,10 +1542,12 @@ _e_fwin_zone_del(void *data, int type, void *event)
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }
/* fm menu extend */ /* fm menu extend */
static void static void
_e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *info __UNUSED__) _e_fwin_menu_extend(void *data,
Evas_Object *obj,
E_Menu *m,
E_Fm2_Icon_Info *info __UNUSED__)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
E_Menu_Item *mi; E_Menu_Item *mi;
@ -1453,13 +1572,17 @@ _e_fwin_menu_extend(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info *in
} }
static void static void
_e_fwin_parent(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) _e_fwin_parent(void *data,
E_Menu *m __UNUSED__,
E_Menu_Item *mi __UNUSED__)
{ {
e_fm2_parent_go(data); e_fm2_parent_go(data);
} }
static void static void
_e_fwin_cb_menu_open_fast(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi) _e_fwin_cb_menu_open_fast(void *data,
E_Menu *m __UNUSED__,
E_Menu_Item *mi)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
Efreet_Desktop *desk; Efreet_Desktop *desk;
@ -1472,7 +1595,8 @@ _e_fwin_cb_menu_open_fast(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
} }
static void static void
_e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m) _e_fwin_cb_menu_extend_open_with(void *data,
E_Menu *m)
{ {
Eina_List *selected = NULL, *apps = NULL, *l; Eina_List *selected = NULL, *apps = NULL, *l;
E_Menu_Item *mi; E_Menu_Item *mi;
@ -1513,7 +1637,10 @@ _e_fwin_cb_menu_extend_open_with(void *data, E_Menu *m)
} }
static void static void
_e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj __UNUSED__, E_Menu *m, E_Fm2_Icon_Info *info __UNUSED__) _e_fwin_cb_menu_extend_start(void *data,
Evas_Object *obj __UNUSED__,
E_Menu *m,
E_Fm2_Icon_Info *info __UNUSED__)
{ {
E_Menu_Item *mi; E_Menu_Item *mi;
E_Fwin_Page *page; E_Fwin_Page *page;
@ -1535,7 +1662,9 @@ _e_fwin_cb_menu_extend_start(void *data, Evas_Object *obj __UNUSED__, E_Menu *m,
} }
static void static void
_e_fwin_cb_menu_open(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) _e_fwin_cb_menu_open(void *data,
E_Menu *m __UNUSED__,
E_Menu_Item *mi __UNUSED__)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
Eina_List *selected; Eina_List *selected;
@ -1548,7 +1677,9 @@ _e_fwin_cb_menu_open(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED_
} }
static void static void
_e_fwin_cb_menu_open_with(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) _e_fwin_cb_menu_open_with(void *data,
E_Menu *m __UNUSED__,
E_Menu_Item *mi __UNUSED__)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
Eina_List *selected = NULL; Eina_List *selected = NULL;
@ -1562,7 +1693,9 @@ _e_fwin_cb_menu_open_with(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UN
/* 'open with' dialog*/ /* 'open with' dialog*/
static void static void
_e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always) _e_fwin_file_open_dialog(E_Fwin_Page *page,
Eina_List *files,
int always)
{ {
E_Fwin *fwin = page->fwin, *fwin2 = NULL; E_Fwin *fwin = page->fwin, *fwin2 = NULL;
E_Dialog *dia; E_Dialog *dia;
@ -1938,7 +2071,10 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page, Eina_List *files, int always)
} }
static void static void
_e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info) _e_fwin_file_open_dialog_cb_key_down(void *data,
Evas *e __UNUSED__,
Evas_Object *o __UNUSED__,
void *event_info)
{ {
Evas_Event_Key_Down *ev = event_info; Evas_Event_Key_Down *ev = event_info;
E_Fwin_Page *page = data; E_Fwin_Page *page = data;
@ -1951,7 +2087,8 @@ _e_fwin_file_open_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object
} }
static int static int
_e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2) _e_fwin_dlg_cb_desk_sort(const void *p1,
const void *p2)
{ {
Efreet_Desktop *d1, *d2; Efreet_Desktop *d1, *d2;
@ -1964,7 +2101,8 @@ _e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2)
} }
static int static int
_e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2) _e_fwin_dlg_cb_desk_list_sort(const void *data1,
const void *data2)
{ {
const Efreet_Desktop *d1, *d2; const Efreet_Desktop *d1, *d2;
@ -1974,7 +2112,8 @@ _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2)
} }
static void static void
_e_fwin_cb_exec_cmd_changed(void *data, void *data2 __UNUSED__) _e_fwin_cb_exec_cmd_changed(void *data,
void *data2 __UNUSED__)
{ {
E_Fwin_Apps_Dialog *fad = NULL; E_Fwin_Apps_Dialog *fad = NULL;
Efreet_Desktop *desktop = NULL; Efreet_Desktop *desktop = NULL;
@ -1995,7 +2134,8 @@ _e_fwin_cb_exec_cmd_changed(void *data, void *data2 __UNUSED__)
} }
static void static void
_e_fwin_cb_open(void *data, E_Dialog *dia __UNUSED__) _e_fwin_cb_open(void *data,
E_Dialog *dia __UNUSED__)
{ {
E_Fwin_Apps_Dialog *fad; E_Fwin_Apps_Dialog *fad;
Efreet_Desktop *desktop = NULL; Efreet_Desktop *desktop = NULL;
@ -2035,7 +2175,8 @@ _e_fwin_cb_open(void *data, E_Dialog *dia __UNUSED__)
} }
static void static void
_e_fwin_cb_close(void *data, E_Dialog *dia __UNUSED__) _e_fwin_cb_close(void *data,
E_Dialog *dia __UNUSED__)
{ {
E_Fwin_Apps_Dialog *fad; E_Fwin_Apps_Dialog *fad;
@ -2059,7 +2200,9 @@ _e_fwin_cb_dialog_free(void *obj)
/* scrolling ability */ /* scrolling ability */
static void static void
_e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) _e_fwin_pan_set(Evas_Object *obj,
Evas_Coord x,
Evas_Coord y)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
@ -2075,7 +2218,9 @@ _e_fwin_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
} }
static void static void
_e_fwin_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) _e_fwin_pan_get(Evas_Object *obj,
Evas_Coord *x,
Evas_Coord *y)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
@ -2086,7 +2231,9 @@ _e_fwin_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
} }
static void static void
_e_fwin_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) _e_fwin_pan_max_get(Evas_Object *obj,
Evas_Coord *x,
Evas_Coord *y)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
@ -2098,7 +2245,9 @@ _e_fwin_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
} }
static void static void
_e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) _e_fwin_pan_child_size_get(Evas_Object *obj,
Evas_Coord *w,
Evas_Coord *h)
{ {
E_Fwin_Page *page; E_Fwin_Page *page;
@ -2147,10 +2296,10 @@ _e_fwin_pan_scroll_update(E_Fwin_Page *page)
page->fm_pan_last.h = page->fm_pan.h; page->fm_pan_last.h = page->fm_pan.h;
} }
/* e_fm_op_registry */ /* e_fm_op_registry */
static void static void
_e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere) _e_fwin_op_registry_listener_cb(void *data,
const E_Fm2_Op_Registry_Entry *ere)
{ {
Evas_Object *o = data; Evas_Object *o = data;
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -2172,12 +2321,15 @@ _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere)
case E_FM_OP_COPY: case E_FM_OP_COPY:
edje_object_signal_emit(o, "e,action,icon,copy", "e"); edje_object_signal_emit(o, "e,action,icon,copy", "e");
break; break;
case E_FM_OP_MOVE: case E_FM_OP_MOVE:
edje_object_signal_emit(o, "e,action,icon,move", "e"); edje_object_signal_emit(o, "e,action,icon,move", "e");
break; break;
case E_FM_OP_REMOVE: case E_FM_OP_REMOVE:
edje_object_signal_emit(o, "e,action,icon,delete", "e"); edje_object_signal_emit(o, "e,action,icon,delete", "e");
break; break;
default: default:
edje_object_signal_emit(o, "e,action,icon,unknow", "e"); edje_object_signal_emit(o, "e,action,icon,unknow", "e");
} }
@ -2191,12 +2343,15 @@ _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere)
case E_FM_OP_COPY: case E_FM_OP_COPY:
snprintf(buf, sizeof(buf), _("Copying is aborted")); snprintf(buf, sizeof(buf), _("Copying is aborted"));
break; break;
case E_FM_OP_MOVE: case E_FM_OP_MOVE:
snprintf(buf, sizeof(buf), _("Moving is aborted")); snprintf(buf, sizeof(buf), _("Moving is aborted"));
break; break;
case E_FM_OP_REMOVE: case E_FM_OP_REMOVE:
snprintf(buf, sizeof(buf), _("Deleting is aborted")); snprintf(buf, sizeof(buf), _("Deleting is aborted"));
break; break;
default: default:
snprintf(buf, sizeof(buf), _("Unknown operation from slave is aborted")); snprintf(buf, sizeof(buf), _("Unknown operation from slave is aborted"));
} }
@ -2212,18 +2367,21 @@ _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere)
else else
snprintf(buf, sizeof(buf), _("Copying %s (eta: %d sec)"), total, ere->eta); snprintf(buf, sizeof(buf), _("Copying %s (eta: %d sec)"), total, ere->eta);
break; break;
case E_FM_OP_MOVE: case E_FM_OP_MOVE:
if (ere->finished) if (ere->finished)
snprintf(buf, sizeof(buf), _("Move of %s done"), total); snprintf(buf, sizeof(buf), _("Move of %s done"), total);
else else
snprintf(buf, sizeof(buf), _("Moving %s (eta: %d sec)"), total, ere->eta); snprintf(buf, sizeof(buf), _("Moving %s (eta: %d sec)"), total, ere->eta);
break; break;
case E_FM_OP_REMOVE: case E_FM_OP_REMOVE:
if (ere->finished) if (ere->finished)
snprintf(buf, sizeof(buf), _("Delete done")); snprintf(buf, sizeof(buf), _("Delete done"));
else else
snprintf(buf, sizeof(buf), _("Deleting files...")); snprintf(buf, sizeof(buf), _("Deleting files..."));
break; break;
default: default:
snprintf(buf, sizeof(buf), _("Unknow operation from slave %d"), ere->id); snprintf(buf, sizeof(buf), _("Unknow operation from slave %d"), ere->id);
} }
@ -2251,7 +2409,9 @@ _e_fwin_op_registry_free_data(void *data)
} }
static Eina_Bool static Eina_Bool
_e_fwin_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event) _e_fwin_op_registry_entry_add_cb(void *data,
__UNUSED__ int type,
void *event)
{ {
E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event; E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event;
E_Fwin_Page *page = data; E_Fwin_Page *page = data;
@ -2294,7 +2454,10 @@ _e_fwin_op_registry_entry_iter(E_Fwin_Page *page)
} }
static void static void
_e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) _e_fwin_op_registry_abort_cb(void *data,
Evas_Object *obj __UNUSED__,
const char *emission __UNUSED__,
const char *source __UNUSED__)
{ {
int id; int id;
@ -2302,3 +2465,4 @@ _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj __UNUSED__, const char
if (!id) return; if (!id) return;
e_fm2_operation_abort(id); e_fm2_operation_abort(id);
} }

View File

@ -73,13 +73,19 @@ struct _E_Config_Dialog_Data
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _fill_data(E_Config_Dialog_Data *cfdata); static void _fill_data(E_Config_Dialog_Data *cfdata);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd,
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply(E_Config_Dialog *cfd,
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); E_Config_Dialog_Data *cfdata);
static int _basic_check_changed(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd,
Evas *evas,
E_Config_Dialog_Data *cfdata);
E_Config_Dialog * E_Config_Dialog *
e_int_config_fileman(E_Container *con, const char *params __UNUSED__) e_int_config_fileman(E_Container *con,
const char *params __UNUSED__)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
@ -131,14 +137,16 @@ _fill_data(E_Config_Dialog_Data *cfdata)
} }
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata)
{ {
E_FREE(cfd->data); E_FREE(cfd->data);
E_FREE(cfdata); E_FREE(cfdata);
} }
static int static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata)
{ {
fileman_config->view.mode = cfdata->view.mode; fileman_config->view.mode = cfdata->view.mode;
fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place; fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place;
@ -175,10 +183,11 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
} }
static int static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _basic_check_changed(E_Config_Dialog *cfd __UNUSED__,
E_Config_Dialog_Data *cfdata)
{ {
return return
((fileman_config->view.mode != cfdata->view.mode) || (fileman_config->view.mode != cfdata->view.mode) ||
(fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) || (fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) ||
(fileman_config->view.single_click != cfdata->view.single_click) || (fileman_config->view.single_click != cfdata->view.single_click) ||
(fileman_config->view.show_full_path != cfdata->view.show_full_path) || (fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
@ -193,11 +202,13 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) || (fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) ||
(e_config->device_desktop != cfdata->dbus.desktop) || (e_config->device_desktop != cfdata->dbus.desktop) ||
(e_config->device_auto_mount != cfdata->dbus.auto_mount) || (e_config->device_auto_mount != cfdata->dbus.auto_mount) ||
(e_config->device_auto_open != cfdata->dbus.auto_open)); (e_config->device_auto_open != cfdata->dbus.auto_open);
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd __UNUSED__,
Evas *evas,
E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o, *ob, *of, *otb; Evas_Object *o, *ob, *of, *otb;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -286,3 +297,4 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_toolbook_page_show(otb, 0); e_widget_toolbook_page_show(otb, 0);
return otb; return otb;
} }

View File

@ -21,7 +21,8 @@ struct _E_Fileman_DBus_Daemon
}; };
static DBusMessage * static DBusMessage *
_e_fileman_dbus_daemon_error(DBusMessage *message, const char *msg) _e_fileman_dbus_daemon_error(DBusMessage *message,
const char *msg)
{ {
return dbus_message_new_error(message, E_FILEMAN_ERROR, msg); return dbus_message_new_error(message, E_FILEMAN_ERROR, msg);
} }
@ -63,7 +64,8 @@ _e_fileman_dbus_daemon_free(E_Fileman_DBus_Daemon *d)
} }
DBusMessage * DBusMessage *
_e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *message) _e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__,
DBusMessage *message)
{ {
DBusMessageIter itr; DBusMessageIter itr;
const char *directory = NULL, *p; const char *directory = NULL, *p;
@ -83,7 +85,6 @@ _e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMess
if (!zone) if (!zone)
return _e_fileman_dbus_daemon_error(message, "could not find a zone."); return _e_fileman_dbus_daemon_error(message, "could not find a zone.");
p = strchr(directory, '/'); p = strchr(directory, '/');
if (p) if (p)
{ {
@ -114,7 +115,9 @@ _e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMess
} }
static void static void
_e_fileman_dbus_daemon_request_name_cb(void *data, DBusMessage *msg, DBusError *err) _e_fileman_dbus_daemon_request_name_cb(void *data,
DBusMessage *msg,
DBusError *err)
{ {
E_Fileman_DBus_Daemon *d = data; E_Fileman_DBus_Daemon *d = data;
dbus_uint32_t ret; dbus_uint32_t ret;
@ -149,9 +152,11 @@ _e_fileman_dbus_daemon_request_name_cb(void *data, DBusMessage *msg, DBusError *
case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER: case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
_e_fileman_dbus_daemon_object_init(d); _e_fileman_dbus_daemon_object_init(d);
break; break;
case DBUS_REQUEST_NAME_REPLY_IN_QUEUE: case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
//XXX mark daemon as queued? //XXX mark daemon as queued?
break; break;
case DBUS_REQUEST_NAME_REPLY_EXISTS: case DBUS_REQUEST_NAME_REPLY_EXISTS:
//XXX exit? //XXX exit?
break; break;
@ -207,7 +212,6 @@ _e_fileman_dbus_daemon_new(void)
return NULL; return NULL;
} }
static E_Fileman_DBus_Daemon *_daemon = NULL; static E_Fileman_DBus_Daemon *_daemon = NULL;
void void
@ -230,3 +234,4 @@ e_fileman_dbus_shutdown(void)
_daemon = NULL; _daemon = NULL;
e_dbus_shutdown(); e_dbus_shutdown();
} }

View File

@ -5,15 +5,25 @@
#include "e_mod_dbus.h" #include "e_mod_dbus.h"
/* actual module specifics */ /* actual module specifics */
static void _e_mod_action_fileman_cb(E_Object *obj, const char *params); static void _e_mod_action_fileman_cb(E_Object *obj,
static void _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi); const char *params);
static void _e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_mod_menu_gtk_cb(void *data,
static void _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi); E_Menu *m,
static void _e_mod_menu_add(void *data, E_Menu *m); E_Menu_Item *mi);
static void _e_mod_menu_virtual_cb(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_mod_menu_volume_cb(void *data,
E_Menu *m,
E_Menu_Item *mi);
static void _e_mod_menu_add(void *data,
E_Menu *m);
static void _e_mod_fileman_config_load(void); static void _e_mod_fileman_config_load(void);
static void _e_mod_fileman_config_free(void); static void _e_mod_fileman_config_free(void);
static Eina_Bool _e_mod_cb_config_timer(void *data); static Eina_Bool _e_mod_cb_config_timer(void *data);
static Eina_Bool _e_mod_zone_add(void *data, int type, void *event); static Eina_Bool _e_mod_zone_add(void *data,
int type,
void *event);
static E_Module *conf_module = NULL; static E_Module *conf_module = NULL;
static E_Action *act = NULL; static E_Action *act = NULL;
@ -166,7 +176,8 @@ e_modapi_save(E_Module *m __UNUSED__)
/* action callback */ /* action callback */
static void static void
_e_mod_action_fileman_cb(E_Object *obj, const char *params) _e_mod_action_fileman_cb(E_Object *obj,
const char *params)
{ {
E_Zone *zone = NULL; E_Zone *zone = NULL;
@ -221,7 +232,9 @@ _e_mod_action_fileman_cb(E_Object *obj, const char *params)
//~ } //~ }
static void static void
_e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) _e_mod_menu_gtk_cb(void *data,
E_Menu *m,
E_Menu_Item *mi __UNUSED__)
{ {
char *path; char *path;
@ -231,13 +244,17 @@ _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
} }
static void static void
_e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) _e_mod_menu_virtual_cb(void *data,
E_Menu *m,
E_Menu_Item *mi __UNUSED__)
{ {
if (m->zone) e_fwin_new(m->zone->container, data, "/"); if (m->zone) e_fwin_new(m->zone->container, data, "/");
} }
static void static void
_e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__) _e_mod_menu_volume_cb(void *data,
E_Menu *m,
E_Menu_Item *mi __UNUSED__)
{ {
E_Volume *vol = data; E_Volume *vol = data;
@ -257,7 +274,8 @@ _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
} }
static void static void
_e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator) _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m,
Eina_Bool need_separator)
{ {
char line[PATH_MAX]; char line[PATH_MAX];
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -308,7 +326,8 @@ _e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator)
/* menu item add hook */ /* menu item add hook */
void void
_e_mod_menu_generate(void *data __UNUSED__, E_Menu *m) _e_mod_menu_generate(void *data __UNUSED__,
E_Menu *m)
{ {
E_Menu_Item *mi; E_Menu_Item *mi;
E_Volume *vol; E_Volume *vol;
@ -376,7 +395,8 @@ _e_mod_menu_generate(void *data __UNUSED__, E_Menu *m)
} }
void void
_e_mod_menu_add(void *data __UNUSED__, E_Menu *m) _e_mod_menu_add(void *data __UNUSED__,
E_Menu *m)
{ {
#ifdef ENABLE_FILES #ifdef ENABLE_FILES
E_Menu_Item *mi; E_Menu_Item *mi;
@ -524,7 +544,9 @@ _e_mod_cb_config_timer(void *data)
} }
static Eina_Bool static Eina_Bool
_e_mod_zone_add(__UNUSED__ void *data, int type, void *event) _e_mod_zone_add(__UNUSED__ void *data,
int type,
void *event)
{ {
E_Event_Zone_Add *ev; E_Event_Zone_Add *ev;
E_Zone *zone; E_Zone *zone;
@ -549,3 +571,4 @@ _e_mod_zone_add(__UNUSED__ void *data, int type, void *event)
} }
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }