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

Fix callback for list sorting. 

SVN revision: 37202
This commit is contained in:
Sebastian Dransfeld 2008-10-27 07:33:21 +00:00
parent d769a61c25
commit 92ff3dab37
11 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_actions.c
View File

@ -68,7 +68,7 @@
/* local subsystem functions */
static void _e_action_free(E_Action *act);
static E_Maximize _e_actions_maximize_parse(const char *maximize);
static int _action_groups_sort_cb(void *d1, void *d2);
static int _action_groups_sort_cb(const void *d1, const void *d2);
/* to save writing this in N places - the sctions are defined here */
/***************************************************************************/
@ -2881,9 +2881,9 @@ _e_actions_maximize_parse(const char *params)
}
static int
_action_groups_sort_cb(void *d1, void *d2)
_action_groups_sort_cb(const void *d1, const void *d2)
{
E_Action_Group *g1, *g2;
const E_Action_Group *g1, *g2;
g1 = d1;
g2 = d2;

2
src/bin/e_border.c
View File

@ -3363,7 +3363,7 @@ e_border_immortal_windows_get(void)
}
EAPI const char *
e_border_name_get(E_Border *bd)
e_border_name_get(const E_Border *bd)
{
E_OBJECT_CHECK_RETURN(bd, "");
E_OBJECT_TYPE_CHECK_RETURN(bd, E_BORDER_TYPE, "");

2
src/bin/e_border.h
View File

@ -624,7 +624,7 @@ EAPI void e_border_resize_cancel(void);
EAPI void e_border_frame_recalc(E_Border *bd);
EAPI Eina_List *e_border_immortal_windows_get(void);
EAPI const char *e_border_name_get(E_Border *bd);
EAPI const char *e_border_name_get(const E_Border *bd);
EAPI void e_border_signal_move_begin(E_Border *bd, const char *sig, const char *src);
EAPI void e_border_signal_move_end(E_Border *bd, const char *sig, const char *src);

12
src/bin/e_fm.c
View File

@ -264,7 +264,7 @@ static void _e_fm2_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *even
static void _e_fm2_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_fm2_cb_scroll_job(void *data);
static void _e_fm2_cb_resize_job(void *data);
static int _e_fm2_cb_icon_sort(void *data1, void *data2);
static int _e_fm2_cb_icon_sort(const void *data1, const void *data2);
static int _e_fm2_cb_scan_timer(void *data);
static int _e_fm2_cb_sort_idler(void *data);
@ -359,7 +359,7 @@ static int _e_fm_client_file_copy(const char *args);
static void _e_fm2_sel_rect_update(void *data);
static inline void _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_Menu *mn, E_Fm2_Icon *ic);
static int _e_fm2_context_list_sort(void *data1, void *data2);
static int _e_fm2_context_list_sort(const void *data1, const void *data2);
static char *_e_fm_string_append_char(char *str, size_t *size, size_t *len, char c);
static char *_e_fm_string_append_quoted(char *str, size_t *size, size_t *len, const char *src);
@ -5927,9 +5927,9 @@ _e_fm2_cb_resize_job(void *data)
}
static int
_e_fm2_cb_icon_sort(void *data1, void *data2)
_e_fm2_cb_icon_sort(const void *data1, const void *data2)
{
E_Fm2_Icon *ic1, *ic2;
const E_Fm2_Icon *ic1, *ic2;
char *l1, *l2;
ic1 = data1;
@ -6785,9 +6785,9 @@ _e_fm2_context_menu_append(Evas_Object *obj, const char *path, Eina_List *l, E_M
}
static int
_e_fm2_context_list_sort(void *data1, void *data2)
_e_fm2_context_list_sort(const void *data1, const void *data2)
{
E_Fm2_Mime_Handler *d1, *d2;
const E_Fm2_Mime_Handler *d1, *d2;
if (!data1) return 1;
if (!data2) return -1;

24
src/bin/e_gadcon.c
View File

@ -2518,8 +2518,8 @@ static void _e_gadcon_layout_smart_clip_unset(Evas_Object *obj);
static void _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino, int *cur);
void _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur);
static int _e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2);
static int _e_gadcon_layout_smart_sort_by_position_cb(void *d1, void *d2);
static int _e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2);
static int _e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2);
/* local subsystem globals */
static Evas_Smart *_e_smart = NULL;
@ -3340,9 +3340,9 @@ _e_gadcon_layout_smart_min_cur_size_calc(E_Smart_Data *sd, int *min, int *mino,
}
static int
_e_gadcon_layout_smart_width_smart_sort_reverse_cb(void *d1, void *d2)
_e_gadcon_layout_smart_width_smart_sort_reverse_cb(const void *d1, const void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
const E_Gadcon_Layout_Item *bi, *bi2;
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
@ -3571,9 +3571,9 @@ _e_gadcon_layout_smart_gadcons_width_adjust(E_Smart_Data *sd, int min, int cur)
}
static int
_e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2)
_e_gadcon_layout_smart_sort_by_sequence_number_cb(const void *d1, const void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
const E_Gadcon_Layout_Item *bi, *bi2;
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
@ -3586,9 +3586,9 @@ _e_gadcon_layout_smart_sort_by_sequence_number_cb(void *d1, void *d2)
}
static int
_e_gadcon_layout_smart_sort_by_position_cb(void *d1, void *d2)
_e_gadcon_layout_smart_sort_by_position_cb(const void *d1, const void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
const E_Gadcon_Layout_Item *bi, *bi2;
bi = evas_object_data_get(d1, "e_gadcon_layout_data");
bi2 = evas_object_data_get(d2, "e_gadcon_layout_data");
@ -3599,9 +3599,9 @@ _e_gadcon_layout_smart_sort_by_position_cb(void *d1, void *d2)
}
static int
_e_gadcon_layout_smart_containers_sort_cb(void *d1, void *d2)
_e_gadcon_layout_smart_containers_sort_cb(const void *d1, const void *d2)
{
E_Layout_Item_Container *lc, *lc2;
const E_Layout_Item_Container *lc, *lc2;
lc = d1;
lc2 = d2;
@ -3613,9 +3613,9 @@ _e_gadcon_layout_smart_containers_sort_cb(void *d1, void *d2)
}
static int
_e_gadcon_layout_smart_seq_sort_cb(void *d1, void *d2)
_e_gadcon_layout_smart_seq_sort_cb(const void *d1, const void *d2)
{
E_Gadcon_Layout_Item *bi, *bi2;
const E_Gadcon_Layout_Item *bi, *bi2;
bi = d1;
bi2 = d2;

6
src/bin/e_int_config_modules.c
View File

@ -76,7 +76,7 @@ static Evas_Bool _mod_hash_avail_list (const Evas_Hash *hash __UNUSED__,
static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__,
const void *key __UNUSED__,
void *data, void *fdata);
static int _mod_list_sort (void *data1, void *data2);
static int _mod_list_sort (const void *data1, const void *data2);
static void _list_widget_load (Evas_Object *obj, Eina_List *list);
static void _avail_list_cb_change (void *data, Evas_Object *obj);
static void _load_list_cb_change (void *data, Evas_Object *obj);
@ -476,9 +476,9 @@ _mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const void *key __UNUSED__
}
static int
_mod_list_sort(void *data1, void *data2)
_mod_list_sort(const void *data1, const void *data2)
{
CFModule *m1, *m2;
const CFModule *m1, *m2;
if (!(m1 = data1)) return 1;
if (!(m2 = data2)) return -1;

32
src/bin/e_int_menus.c
View File

@ -45,10 +45,10 @@ static void _e_int_menus_clients_free_hook (void *obj);
static void _e_int_menus_clients_item_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_clients_icon_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_clients_cleanup_cb (void *data, E_Menu *m, E_Menu_Item *mi);
static int _e_int_menus_clients_group_desk_cb (void *d1, void *d2);
static int _e_int_menus_clients_group_class_cb (void *d1, void *d2);
static int _e_int_menus_clients_sort_alpha_cb (void *d1, void *d2);
static int _e_int_menus_clients_sort_z_order_cb (void *d1, void *d2);
static int _e_int_menus_clients_group_desk_cb (const void *d1, const void *d2);
static int _e_int_menus_clients_group_class_cb (const void *d1, const void *d2);
static int _e_int_menus_clients_sort_alpha_cb (const void *d1, const void *d2);
static int _e_int_menus_clients_sort_z_order_cb (const void *d1, const void *d2);
static void _e_int_menus_clients_add_by_class (Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_desk (E_Desk *curr_desk, Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_none (Eina_List *borders, E_Menu *m);
@ -948,11 +948,11 @@ _e_int_menus_sys_free_hook(void *obj)
}
static int
_e_int_menus_clients_group_desk_cb(void *d1, void *d2)
_e_int_menus_clients_group_desk_cb(const void *d1, const void *d2)
{
E_Border *bd1;
E_Border *bd2;
int j,k;
const E_Border *bd1;
const E_Border *bd2;
int j, k;
if (!d1) return 1;
if (!d2) return -1;
@ -969,10 +969,10 @@ _e_int_menus_clients_group_desk_cb(void *d1, void *d2)
}
static int
_e_int_menus_clients_group_class_cb(void *d1, void *d2)
_e_int_menus_clients_group_class_cb(const void *d1, const void *d2)
{
E_Border *bd1;
E_Border *bd2;
const E_Border *bd1;
const E_Border *bd2;
if (!d1) return 1;
if (!d2) return -1;
@ -992,10 +992,10 @@ _e_int_menus_clients_group_class_cb(void *d1, void *d2)
}
static int
_e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
_e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2)
{
E_Border *bd1;
E_Border *bd2;
const E_Border *bd1;
const E_Border *bd2;
const char *name1;
const char *name2;
@ -1013,9 +1013,9 @@ _e_int_menus_clients_sort_alpha_cb(void *d1, void *d2)
}
static int
_e_int_menus_clients_sort_z_order_cb(void *d1, void *d2)
_e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2)
{
E_Border *bd1, *bd2;
const E_Border *bd1, *bd2;
if (!d1) return 1;
if (!d2) return -1;

6
src/bin/e_module.c
View File

@ -16,7 +16,7 @@ static void _e_module_dialog_disable_show(const char *title, const char *body, E
static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia);
static void _e_module_event_update_free(void *data, void *event);
static int _e_module_cb_idler(void *data);
static int _e_module_sort_priority(void *d1, void *d2);
static int _e_module_sort_priority(const void *d1, const void *d2);
/* local subsystem globals */
static Eina_List *_e_modules = NULL;
@ -573,9 +573,9 @@ _e_module_cb_idler(void *data)
}
static int
_e_module_sort_priority(void *d1, void *d2)
_e_module_sort_priority(const void *d1, const void *d2)
{
E_Config_Module *m1, *m2;
const E_Config_Module *m1, *m2;
m1 = d1;
m2 = d2;

6
src/bin/e_remember.c
View File

@ -8,7 +8,7 @@
/* local subsystem functions */
static void _e_remember_free(E_Remember *rem);
static int _e_remember_sort_list(void * d1, void * d2);
static int _e_remember_sort_list(const void * d1, const void * d2);
static E_Remember *_e_remember_find(E_Border *bd, int check_usable);
/* FIXME: match netwm window type */
@ -466,9 +466,9 @@ _e_remember_free(E_Remember *rem)
}
static int
_e_remember_sort_list(void * d1, void * d2)
_e_remember_sort_list(const void * d1, const void * d2)
{
E_Remember *r1, *r2;
const E_Remember *r1, *r2;
r1 = d1;
r2 = d2;

6
src/bin/e_shelf.c
View File

@ -19,7 +19,7 @@ static void _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Me
static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static int _e_shelf_cb_mouse_in(void *data, int type, void *event);
static int _e_shelf_cb_mouse_out(void *data, int type, void *event);
static int _e_shelf_cb_id_sort(void *data1, void *data2);
static int _e_shelf_cb_id_sort(const void *data1, const void *data2);
static int _e_shelf_cb_hide_animator(void *data);
static int _e_shelf_cb_hide_animator_timer(void *data);
static int _e_shelf_cb_instant_hide_timer(void *data);
@ -1354,9 +1354,9 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
}
static int
_e_shelf_cb_id_sort(void *data1, void *data2)
_e_shelf_cb_id_sort(const void *data1, const void *data2)
{
E_Shelf *es1, *es2;
const E_Shelf *es1, *es2;
es1 = data1;
es2 = data2;

6
src/bin/e_xinerama.c
View File

@ -5,7 +5,7 @@
static void _e_xinerama_clean(void);
static void _e_xinerama_update(void);
static int _e_xinerama_cb_screen_sort(void *data1, void *data2);
static int _e_xinerama_cb_screen_sort(const void *data1, const void *data2);
static Eina_List *all_screens = NULL;
static Eina_List *chosen_screens = NULL;
@ -204,9 +204,9 @@ _e_xinerama_update(void)
}
static int
_e_xinerama_cb_screen_sort(void *data1, void *data2)
_e_xinerama_cb_screen_sort(const void *data1, const void *data2)
{
E_Screen *scr, *scr2;
const E_Screen *scr, *scr2;
int dif;
scr = data1;