another change I've been wanting to make for a long time: e_entry_dialog now has the data param first

SVN revision: 75983
devs/princeamd/enlightenment-0.17-elive
Mike Blumenkrantz 11 years ago
parent 0d81189ac2
commit 2d0c34fc28
  1. 4
      src/bin/e_entry_dialog.c
  2. 4
      src/bin/e_entry_dialog.h
  3. 8
      src/bin/e_fm.c
  4. 2
      src/bin/e_shelf.c
  5. 4
      src/modules/conf_dialogs/e_int_config_profiles.c
  6. 4
      src/modules/conf_shelves/e_int_config_shelf.c
  7. 4
      src/modules/ibar/e_mod_config.c
  8. 2
      src/modules/quickaccess/e_mod_config.c

@ -13,7 +13,7 @@ EAPI E_Entry_Dialog *
e_entry_dialog_show(const char *title, const char *icon, const char *text,
const char *initial_text,
const char *button_text, const char *button2_text,
void (*ok_func)(char *text, void *data),
void (*ok_func)(void *data, char *text),
void (*cancel_func)(void *data), void *data)
{
E_Entry_Dialog *ed;
@ -94,7 +94,7 @@ _e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__)
ed = data;
e_object_ref(E_OBJECT(ed));
if (ed->ok.func) ed->ok.func(ed->text, ed->ok.data);
if (ed->ok.func) ed->ok.func(ed->ok.data, ed->text);
e_object_del(E_OBJECT(ed));
e_object_unref(E_OBJECT(ed));
}

@ -16,7 +16,7 @@ struct _E_Entry_Dialog
Evas_Object *entry;
char *text;
struct {
void (*func) (char *text, void *data);
void (*func) (void *data, char *text);
void *data;
} ok;
struct {
@ -31,7 +31,7 @@ EAPI E_Entry_Dialog *e_entry_dialog_show(const char *title,
const char *initial_text,
const char *button_text,
const char *button2_text,
void (*ok_func) (char *text, void *data),
void (*ok_func) (void *data, char *text),
void (*cancel_func) (void *data),
void *data);

@ -359,11 +359,11 @@ static void _e_fm2_toggle_ordering(void *data, E_Menu *m, E_Menu_Item *
static void _e_fm2_sort(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_new_directory(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_new_directory_delete_cb(void *obj);
static void _e_fm2_new_directory_yes_cb(char *text, void *data);
static void _e_fm2_new_directory_yes_cb(void *data, char *text);
static void _e_fm2_new_directory_no_cb(void *data);
static void _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_file_rename_delete_cb(void *obj);
static void _e_fm2_file_rename_yes_cb(char *text, void *data);
static void _e_fm2_file_rename_yes_cb(void *data, char *text);
static void _e_fm2_file_rename_no_cb(void *data);
static void _e_fm2_file_application_properties(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__);
static void _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi);
@ -9256,7 +9256,7 @@ _e_fm2_new_directory_delete_cb(void *obj)
}
static void
_e_fm2_new_directory_yes_cb(char *text, void *data)
_e_fm2_new_directory_yes_cb(void *data, char *text)
{
E_Fm2_Smart_Data *sd;
char buf[PATH_MAX];
@ -9396,7 +9396,7 @@ _e_fm2_file_rename_delete_cb(void *obj)
}
static void
_e_fm2_file_rename_yes_cb(char *text, void *data)
_e_fm2_file_rename_yes_cb(void *data, char *text)
{
E_Fm2_Icon *ic;

@ -1991,7 +1991,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
}
static void
_e_shelf_cb_menu_rename_yes_cb(char *text, void *data)
_e_shelf_cb_menu_rename_yes_cb(void *data, char *text)
{
E_Shelf *es = e_object_data_get(data);
Eina_List *l;

@ -13,7 +13,7 @@ static void _cb_reset(void *data, void *data2);
static void _cb_dialog_yes(void *data);
static void _cb_dialog_destroy(void *data);
static void _new_profile_cb_ok(char *text, void *data);
static void _new_profile_cb_ok(void *data, char *text);
static void _new_profile_cb_dia_del(void *obj);
struct _E_Config_Dialog_Data
@ -397,7 +397,7 @@ _cb_dialog_destroy(void *data)
}
static void
_new_profile_cb_ok(char *text, void *data)
_new_profile_cb_ok(void *data, char *text)
{
E_Config_Dialog_Data *cfdata;
char cur_profile[1024];

@ -16,7 +16,7 @@ static void _cb_contents(void *data, void *data2);
static void _ilist_refresh(E_Shelf *es);
static void _new_shelf_dialog(E_Config_Dialog_Data *cfdata);
static void _new_shelf_cb_close(void *data);
static void _new_shelf_cb_ok(char *text, void *data);
static void _new_shelf_cb_ok(void *data, char *text);
static void _new_shelf_cb_dia_del(void *obj);
static void _ilist_item_new(E_Config_Dialog_Data *cfdata, Eina_Bool append, E_Shelf *es);
@ -415,7 +415,7 @@ _cb_add(void *data, void *data2 __UNUSED__)
}
static void
_new_shelf_cb_ok(char *text, void *data)
_new_shelf_cb_ok(void *data, char *text)
{
E_Config_Dialog_Data *cfdata;
E_Config_Shelf *cfg, *c;

@ -22,7 +22,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
static void _cb_add(void *data, void *data2);
static void _cb_del(void *data, void *data2);
static void _cb_config(void *data, void *data2);
static void _cb_entry_ok(char *text, void *data);
static void _cb_entry_ok(void *data, char *text);
static void _cb_confirm_dialog_yes(void *data);
static void _cb_confirm_dialog_destroy(void *data);
static void _load_tlist(E_Config_Dialog_Data *cfdata);
@ -212,7 +212,7 @@ _cb_config(void *data, void *data2 __UNUSED__)
}
static void
_cb_entry_ok(char *text, void *data)
_cb_entry_ok(void *data, char *text)
{
char buf[4096];
char tmp[4096];

@ -168,7 +168,7 @@ _rename_del(void *data)
}
static void
_rename_ok(char *text, void *data)
_rename_ok(void *data, char *text)
{
Config_Entry *ce = data;
const char *name;

Loading…
Cancel
Save