enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

* e: Remove all reference to Evas_Data and move to Eina_Bool. 

SVN revision: 41080
This commit is contained in:
Cedric BAIL 2009-06-17 13:46:54 +00:00
parent af7451ff79
commit c82f19e052
19 changed files with 88 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_exec.c
View File

@ -47,7 +47,7 @@ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, cha
static int _e_exec_cb_expire_timer(void *data); static int _e_exec_cb_expire_timer(void *data);
static int _e_exec_cb_exit(void *data, int type, void *event); static int _e_exec_cb_exit(void *data, int type, void *event);
static Evas_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read); static void _e_exec_error_dialog(Efreet_Desktop *desktop, const char *exec, Ecore_Exe_Event_Del *event, Ecore_Exe_Event_Data *error, Ecore_Exe_Event_Data *read);
static void _fill_data(E_Config_Dialog_Data *cfdata); static void _fill_data(E_Config_Dialog_Data *cfdata);
@ -363,7 +363,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data) _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data)
{ {
E_Exec_Search *search; E_Exec_Search *search;
@ -378,10 +378,10 @@ _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __
(search->pid == ecore_exe_pid_get(inst->exe)))) (search->pid == ecore_exe_pid_get(inst->exe))))
{ {
search->desktop = inst->desktop; search->desktop = inst->desktop;
return 0; return EINA_FALSE;
} }
return 1; return EINA_TRUE;
} }
static void static void

12
src/bin/e_filereg.c
View File

@ -76,26 +76,26 @@ e_filereg_deregister(const char *path)
} }
} }
EAPI Evas_Bool EAPI Eina_Bool
e_filereg_file_protected(const char *path) e_filereg_file_protected(const char *path)
{ {
Filereg_Item *fi = NULL; Filereg_Item *fi = NULL;
fi = eina_hash_find(_e_filereg, path); fi = eina_hash_find(_e_filereg, path);
if (!fi) return 0; if (!fi) return EINA_FALSE;
else return 1; return EINA_TRUE;
} }
/* Private Functions */ /* Private Functions */
static Evas_Bool static Eina_Bool
_filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, _filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__) void *data, void *fdata __UNUSED__)
{ {
Filereg_Item *fi; Filereg_Item *fi;
fi = data; fi = data;
if (!fi) return 1; if (!fi) return EINA_TRUE;
if (fi->path) eina_stringshare_del(fi->path); if (fi->path) eina_stringshare_del(fi->path);
E_FREE(fi); E_FREE(fi);
return 1; return EINA_TRUE;
} }

2
src/bin/e_filereg.h
View File

@ -12,7 +12,7 @@ EAPI int e_filereg_shutdown(void);
EAPI int e_filereg_register(const char * path); EAPI int e_filereg_register(const char * path);
EAPI void e_filereg_deregister(const char * path); EAPI void e_filereg_deregister(const char * path);
EAPI Evas_Bool e_filereg_file_protected(const char * path); EAPI Eina_Bool e_filereg_file_protected(const char * path);
#endif #endif
#endif #endif

8
src/bin/e_fm_mime.h
View File

@ -24,10 +24,10 @@ EAPI void e_fm_mime_icon_cache_flush(void);
EAPI E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (Evas_Object *obj, const char *path, void *data), void *action_data, int (test_func) (Evas_Object *obj, const char *path, void *data), void *test_data); EAPI E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (Evas_Object *obj, const char *path, void *data), void *action_data, int (test_func) (Evas_Object *obj, const char *path, void *data), void *test_data);
EAPI void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler); EAPI void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler);
EAPI Evas_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime); EAPI Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime);
EAPI Evas_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob); EAPI Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob);
EAPI Evas_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); EAPI Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
EAPI Evas_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); EAPI Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path);
EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime); EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime);
EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob); EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob);
EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime); EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime);

2
src/bin/e_fm_op.c
View File

@ -18,8 +18,6 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <Evas_Data.h>
#include <Ecore.h> #include <Ecore.h>
#include <Ecore_File.h> #include <Ecore_File.h>

4
src/bin/e_int_menus.c
View File

@ -214,7 +214,7 @@ e_int_menus_main_new(void)
l = _e_int_menus_augmentation_find("main/9"); l = _e_int_menus_augmentation_find("main/9");
if (l) _e_int_menus_augmentation_add(m, l); if (l) _e_int_menus_augmentation_add(m, l);
l = evas_hash_find(_e_int_menus_augmentation, "main/10"); l = eina_hash_find(_e_int_menus_augmentation, "main/10");
if (l) if (l)
{ {
separator = 1; separator = 1;
@ -223,7 +223,7 @@ e_int_menus_main_new(void)
_e_int_menus_augmentation_add(m, l); _e_int_menus_augmentation_add(m, l);
} }
l = evas_hash_find(_e_int_menus_augmentation, "main/11"); l = eina_hash_find(_e_int_menus_augmentation, "main/11");
if (l) if (l)
{ {
if (!separator) if (!separator)

2
src/bin/e_intl.c
View File

@ -47,7 +47,7 @@ static Eina_List *_e_intl_locale_system_locales_get(void);
static Eina_List *_e_intl_locale_search_order_get(const char *locale); static Eina_List *_e_intl_locale_search_order_get(const char *locale);
static int _e_intl_locale_validate(const char *locale); static int _e_intl_locale_validate(const char *locale);
static void _e_intl_locale_hash_free(Eina_Hash *language_hash); static void _e_intl_locale_hash_free(Eina_Hash *language_hash);
static Evas_Bool _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* Input Method Configuration and Management */ /* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event); static int _e_intl_cb_exit(void *data, int type, void *event);

4
src/bin/e_main.c
View File

@ -94,7 +94,7 @@ static void _e_main_desk_restore(E_Manager *man, E_Container *con);
static int (*_e_main_shutdown_func[MAX_LEVEL]) (void); static int (*_e_main_shutdown_func[MAX_LEVEL]) (void);
static int _e_main_level = 0; static int _e_main_level = 0;
static int _e_cacheburst = 0; static int _e_cacheburst = 0;
static Evas_Bool locked = 0; static Eina_Bool locked = EINA_FALSE;
static Eina_List *_e_main_idler_before_list = NULL; static Eina_List *_e_main_idler_before_list = NULL;
@ -314,7 +314,7 @@ main(int argc, char **argv)
} }
else if (!strcmp(argv[i], "-locked")) else if (!strcmp(argv[i], "-locked"))
{ {
locked = 1; locked = EINA_TRUE;
puts("enlightenment will start with desklock on."); puts("enlightenment will start with desklock on.");
} }
else if ((!strcmp(argv[i], "-h")) || else if ((!strcmp(argv[i], "-h")) ||

18
src/bin/e_menu.c
View File

@ -86,7 +86,7 @@ static int _e_menu_cb_scroll_animator (void *data);
static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev); static int _e_menu_cb_window_shape (void *data, int ev_type, void *ev);
static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_menu_cb_item_submenu_post_default (void *data, E_Menu *m, E_Menu_Item *mi);
static Evas_Bool _e_menu_categories_free_cb (const Eina_Hash *hash, const void *key, void *data, void *fdata); static Eina_Bool _e_menu_categories_free_cb (const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* local subsystem globals */ /* local subsystem globals */
static Ecore_X_Window _e_menu_win = 0; static Ecore_X_Window _e_menu_win = 0;
@ -1781,7 +1781,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
/* the foreign menu items */ /* the foreign menu items */
if (m->category) if (m->category)
{ {
cat = evas_hash_find(_e_menu_categories, m->category); cat = eina_hash_find(_e_menu_categories, m->category);
if (cat) if (cat)
{ {
E_Menu_Category_Callback *cb; E_Menu_Category_Callback *cb;
@ -2852,19 +2852,15 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
} }
static Evas_Bool static Eina_Bool
_e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata) _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
Eina_List *l; E_Menu_Category_Callback *cb;
E_Menu_Category *cat; E_Menu_Category *cat;
cat = (E_Menu_Category *) data; cat = (E_Menu_Category *) data;
l = (Eina_List *) cat->callbacks; EINA_LIST_FREE(cat->callbacks, cb)
while (l) free(cb); /* free the callback struct */
{
free(l->data); /* free the callback struct */
l = eina_list_remove_list(l, l);
}
free(cat); free(cat);
return 1; return EINA_TRUE;
} }

10
src/bin/e_scrollframe.c
View File

@ -56,7 +56,7 @@ struct _E_Smart_Data
} pan_func; } pan_func;
struct struct
{ {
Evas_Bool forced : 1; Eina_Bool forced : 1;
} thumbscroll; } thumbscroll;
unsigned char hbar_visible : 1; unsigned char hbar_visible : 1;
@ -349,21 +349,21 @@ e_scrollframe_edje_object_get(Evas_Object *obj)
} }
EAPI void EAPI void
e_scrollframe_single_dir_set(Evas_Object *obj, Evas_Bool single_dir) e_scrollframe_single_dir_set(Evas_Object *obj, Eina_Bool single_dir)
{ {
API_ENTRY return; API_ENTRY return;
sd->one_dir_at_a_time = single_dir; sd->one_dir_at_a_time = single_dir;
} }
EAPI Evas_Bool EAPI Eina_Bool
e_scrollframe_single_dir_get(Evas_Object *obj) e_scrollframe_single_dir_get(Evas_Object *obj)
{ {
API_ENTRY return 0; API_ENTRY return EINA_FALSE;
return sd->one_dir_at_a_time; return sd->one_dir_at_a_time;
} }
EAPI void EAPI void
e_scrollframe_thumbscroll_force(Evas_Object *obj, Evas_Bool forced) e_scrollframe_thumbscroll_force(Evas_Object *obj, Eina_Bool forced)
{ {
API_ENTRY return; API_ENTRY return;
sd->thumbscroll.forced = forced; sd->thumbscroll.forced = forced;

6
src/bin/e_scrollframe.h
View File

@ -30,9 +30,9 @@ EAPI void e_scrollframe_page_size_get (Evas_Object *obj, Evas_Coord *x
EAPI void e_scrollframe_policy_set (Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar); EAPI void e_scrollframe_policy_set (Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar);
EAPI void e_scrollframe_policy_get (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar); EAPI void e_scrollframe_policy_get (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar);
EAPI Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj); EAPI Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj);
EAPI void e_scrollframe_single_dir_set (Evas_Object *obj, Evas_Bool single_dir); EAPI void e_scrollframe_single_dir_set (Evas_Object *obj, Eina_Bool single_dir);
EAPI Evas_Bool e_scrollframe_single_dir_get (Evas_Object *obj); EAPI Eina_Bool e_scrollframe_single_dir_get (Evas_Object *obj);
EAPI void e_scrollframe_thumbscroll_force (Evas_Object *obj, Evas_Bool forced); EAPI void e_scrollframe_thumbscroll_force (Evas_Object *obj, Eina_Bool forced);
#endif #endif
#endif #endif

2
src/bin/e_sys.h
View File

@ -27,7 +27,7 @@ struct _E_Sys_Con_Action
const char *button_name; const char *button_name;
void (*func) (void *data); void (*func) (void *data);
const void *data; const void *data;
Evas_Bool disabled : 1; Eina_Bool disabled : 1;
}; };
#else #else

8
src/bin/e_theme.c
View File

@ -466,7 +466,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
} }
/* local subsystem functions */ /* local subsystem functions */
static Evas_Bool static Eina_Bool
_e_theme_mappings_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata) _e_theme_mappings_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
E_Theme_Result *res; E_Theme_Result *res;
@ -480,14 +480,14 @@ _e_theme_mappings_free_cb(const Eina_Hash *hash, const void *key, void *data, vo
eina_hash_free(res->quickfind); eina_hash_free(res->quickfind);
} }
free(res); free(res);
return 1; return EINA_TRUE;
} }
static Evas_Bool static Eina_Bool
_e_theme_mappings_quickfind_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata) _e_theme_mappings_quickfind_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{ {
eina_stringshare_del(key); eina_stringshare_del(key);
return 1; return EINA_TRUE;
} }
static void static void

28
src/bin/e_widget_toolbar.c
View File

@ -10,8 +10,8 @@ struct _E_Widget_Data
Evas_Object *o_base, *o_box, *o_scrollframe0; Evas_Object *o_base, *o_box, *o_scrollframe0;
int icon_w, icon_h; int icon_w, icon_h;
Eina_List *items; Eina_List *items;
Evas_Bool scrollable : 1; Eina_Bool scrollable : 1;
Evas_Bool focus_steal : 1; Eina_Bool focus_steal : 1;
}; };
struct _Item struct _Item
@ -19,7 +19,7 @@ struct _Item
Evas_Object *o_toolbar, *o_base, *o_icon; Evas_Object *o_toolbar, *o_base, *o_icon;
void (*func) (void *data1, void *data2); void (*func) (void *data1, void *data2);
const void *data1, *data2; const void *data1, *data2;
Evas_Bool selected : 1; Eina_Bool selected : 1;
}; };
static void _e_wid_del_hook(Evas_Object *obj); static void _e_wid_del_hook(Evas_Object *obj);
@ -50,7 +50,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h)
e_widget_data_set(obj, wd); e_widget_data_set(obj, wd);
wd->icon_w = icon_w; wd->icon_w = icon_w;
wd->icon_h = icon_h; wd->icon_h = icon_h;
wd->focus_steal = 1; wd->focus_steal = EINA_TRUE;
o = e_scrollframe_add(evas); o = e_scrollframe_add(evas);
wd->o_base = o; wd->o_base = o;
@ -167,7 +167,7 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num)
{ {
if (!it->selected) if (!it->selected)
{ {
it->selected = 1; it->selected = EINA_TRUE;
edje_object_signal_emit(it->o_base, "e,state,selected", "e"); edje_object_signal_emit(it->o_base, "e,state,selected", "e");
edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
_item_show(it); _item_show(it);
@ -178,7 +178,7 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num)
{ {
if (it->selected) if (it->selected)
{ {
it->selected = 0; it->selected = EINA_FALSE;
edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); edje_object_signal_emit(it->o_base, "e,state,unselected", "e");
edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
} }
@ -211,7 +211,7 @@ e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label)
} }
EAPI void EAPI void
e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable) e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
Evas_Coord mw = 0, mh = 0, vw = 0, vh = 0; Evas_Coord mw = 0, mh = 0, vw = 0, vh = 0;
@ -229,7 +229,7 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable)
} }
EAPI void EAPI void
e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal) e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal)
{ {
E_Widget_Data *wd; E_Widget_Data *wd;
@ -240,14 +240,14 @@ e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal)
evas_object_event_callback_add(e_scrollframe_edje_object_get(wd->o_base), evas_object_event_callback_add(e_scrollframe_edje_object_get(wd->o_base),
EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj); _e_wid_focus_steal, obj);
wd->focus_steal = 1; wd->focus_steal = EINA_TRUE;
} }
else else
{ {
evas_object_event_callback_del(e_scrollframe_edje_object_get(wd->o_base), evas_object_event_callback_del(e_scrollframe_edje_object_get(wd->o_base),
EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal); _e_wid_focus_steal);
wd->focus_steal = 0; wd->focus_steal = EINA_FALSE;
} }
} }
@ -299,13 +299,13 @@ _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char
it2 = l->data; it2 = l->data;
if (it2->selected) if (it2->selected)
{ {
it2->selected = 0; it2->selected = EINA_FALSE;
edje_object_signal_emit(it2->o_base, "e,state,unselected", "e"); edje_object_signal_emit(it2->o_base, "e,state,unselected", "e");
edje_object_signal_emit(it2->o_icon, "e,state,unselected", "e"); edje_object_signal_emit(it2->o_icon, "e,state,unselected", "e");
break; break;
} }
} }
it->selected = 1; it->selected = EINA_TRUE;
edje_object_signal_emit(it->o_base, "e,state,selected", "e"); edje_object_signal_emit(it->o_base, "e,state,selected", "e");
edje_object_signal_emit(it->o_icon, "e,state,selected", "e"); edje_object_signal_emit(it->o_icon, "e,state,selected", "e");
_item_show(it); _item_show(it);
@ -407,10 +407,10 @@ _e_wid_cb_key_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
} }
if ((it) && (it2) && (it != it2)) if ((it) && (it2) && (it != it2))
{ {
it->selected = 0; it->selected = EINA_FALSE;
edje_object_signal_emit(it->o_base, "e,state,unselected", "e"); edje_object_signal_emit(it->o_base, "e,state,unselected", "e");
edje_object_signal_emit(it->o_icon, "e,state,unselected", "e"); edje_object_signal_emit(it->o_icon, "e,state,unselected", "e");
it2->selected = 1; it2->selected = EINA_TRUE;
edje_object_signal_emit(it2->o_base, "e,state,selected", "e"); edje_object_signal_emit(it2->o_base, "e,state,selected", "e");
edje_object_signal_emit(it2->o_icon, "e,state,selected", "e"); edje_object_signal_emit(it2->o_icon, "e,state,selected", "e");
_item_show(it2); _item_show(it2);

4
src/bin/e_widget_toolbar.h
View File

@ -11,8 +11,8 @@ EAPI void e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, cons
EAPI void e_widget_toolbar_item_remove(Evas_Object *obj, int num); EAPI void e_widget_toolbar_item_remove(Evas_Object *obj, int num);
EAPI void e_widget_toolbar_item_select(Evas_Object *obj, int num); EAPI void e_widget_toolbar_item_select(Evas_Object *obj, int num);
EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label); EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label);
EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable); EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable);
EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal); EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal);
#endif #endif
#endif #endif

4
src/modules/conf_fonts/e_int_config_fonts.c
View File

@ -400,7 +400,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
return 1; return 1;
} }
static Evas_Bool static Eina_Bool
_font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata) _font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -410,7 +410,7 @@ _font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void
efp = data; efp = data;
cfdata->font_list = eina_list_append(cfdata->font_list, efp->name); cfdata->font_list = eina_list_append(cfdata->font_list, efp->name);
return 1; return EINA_TRUE;
} }
static Evas_Object * static Evas_Object *

50
src/modules/conf_wallpaper2/e_int_config_wallpaper.c
View File

@ -55,8 +55,8 @@ struct _Smart_Data
int id_num; int id_num;
double seltime; double seltime;
double selmove; double selmove;
Evas_Bool selin : 1; Eina_Bool selin : 1;
Evas_Bool selout : 1; Eina_Bool selout : 1;
}; };
struct _Item struct _Item
@ -66,12 +66,12 @@ struct _Item
const char *file; const char *file;
char *sort_id; char *sort_id;
Evas_Object *frame, *image; Evas_Object *frame, *image;
Evas_Bool selected : 1; Eina_Bool selected : 1;
Evas_Bool have_thumb : 1; Eina_Bool have_thumb : 1;
Evas_Bool do_thumb : 1; Eina_Bool do_thumb : 1;
Evas_Bool remote : 1; Eina_Bool remote : 1;
Evas_Bool theme : 1; Eina_Bool theme : 1;
Evas_Bool visible : 1; Eina_Bool visible : 1;
}; };
static Info *global_info = NULL; static Info *global_info = NULL;
@ -308,7 +308,7 @@ _e_smart_reconfigure_do(void *data)
if (!it->do_thumb) if (!it->do_thumb)
{ {
e_thumb_icon_begin(it->image); e_thumb_icon_begin(it->image);
it->do_thumb = 1; it->do_thumb = EINA_TRUE;
} }
} }
else else
@ -354,7 +354,7 @@ _e_smart_reconfigure_do(void *data)
yy + dy); yy + dy);
evas_object_resize(it->frame, it->w, it->h); evas_object_resize(it->frame, it->w, it->h);
evas_object_show(it->frame); evas_object_show(it->frame);
it->visible = 1; it->visible = EINA_TRUE;
} }
else else
{ {
@ -363,24 +363,24 @@ _e_smart_reconfigure_do(void *data)
if (it->do_thumb) if (it->do_thumb)
{ {
e_thumb_icon_end(it->image); e_thumb_icon_end(it->image);
it->do_thumb = 0; it->do_thumb = EINA_FALSE;
} }
evas_object_del(it->image); evas_object_del(it->image);
it->image = NULL; it->image = NULL;
evas_object_del(it->frame); evas_object_del(it->frame);
it->frame = NULL; it->frame = NULL;
} }
it->visible = 0; it->visible = EINA_FALSE;
/* /*
if (it->have_thumb) if (it->have_thumb)
{ {
if (it->do_thumb) if (it->do_thumb)
{ {
e_thumb_icon_end(it->image); e_thumb_icon_end(it->image);
it->do_thumb = 0; it->do_thumb = EINA_FALSE;
} }
evas_object_del(it->image); evas_object_del(it->image);
it->have_thumb = 0; it->have_thumb = EINA_FALSE;
it->image = e_thumb_icon_add(evas_object_evas_get(obj)); it->image = e_thumb_icon_add(evas_object_evas_get(obj));
edje_object_part_swallow(it->frame, "e.swallow.content", it->image); edje_object_part_swallow(it->frame, "e.swallow.content", it->image);
evas_object_smart_callback_add(it->image, "e_thumb_gen", _thumb_gen, it); evas_object_smart_callback_add(it->image, "e_thumb_gen", _thumb_gen, it);
@ -599,13 +599,13 @@ _sel_anim(void *data)
{ {
if (sd->selout) if (sd->selout)
{ {
sd->selin = 1; sd->selin = EINA_TRUE;
sd->selout = 0; sd->selout = EINA_FALSE;
sd->seltime = ecore_loop_time_get(); sd->seltime = ecore_loop_time_get();
return 1; return 1;
} }
sd->selout = 0; sd->selout = EINA_FALSE;
sd->selin = 0; sd->selin = EINA_FALSE;
sd->animator = NULL; sd->animator = NULL;
return 0; return 0;
} }
@ -621,7 +621,7 @@ _sel_timer(void *data)
{ {
sd->seltime = ecore_time_get(); sd->seltime = ecore_time_get();
sd->animator = ecore_animator_add(_sel_anim, obj); sd->animator = ecore_animator_add(_sel_anim, obj);
sd->selin = 0; sd->selin = EINA_FALSE;
} }
sd->seltimer = NULL; sd->seltimer = NULL;
return 0; return 0;
@ -642,7 +642,7 @@ _pan_sel(Evas_Object *obj, Item *it)
{ {
if (it2->selected) it2->selected = 0; if (it2->selected) it2->selected = 0;
} }
it->selected = 1; it->selected = EINA_TRUE;
if (sd->info->bg_file) free(sd->info->bg_file); if (sd->info->bg_file) free(sd->info->bg_file);
evas_object_hide(sd->info->mini); evas_object_hide(sd->info->mini);
if (it->file) if (it->file)
@ -676,12 +676,12 @@ _pan_sel_up(Evas_Object *obj)
{ {
sd->seltime = ecore_loop_time_get(); sd->seltime = ecore_loop_time_get();
sd->animator = ecore_animator_add(_sel_anim, obj); sd->animator = ecore_animator_add(_sel_anim, obj);
sd->selin = 1; sd->selin = EINA_TRUE;
} }
else else
{ {
if (sd->selin) return; if (sd->selin) return;
sd->selout = 1; sd->selout = EINA_TRUE;
} }
} }
@ -723,13 +723,13 @@ _thumb_gen(void *data, Evas_Object *obj, void *event_info)
_item_sort(it); _item_sort(it);
} }
} }
it->have_thumb = 1; it->have_thumb = EINA_TRUE;
if (!it->visible) if (!it->visible)
{ {
if (it->do_thumb) if (it->do_thumb)
{ {
e_thumb_icon_end(it->image); e_thumb_icon_end(it->image);
it->do_thumb = 0; it->do_thumb = EINA_FALSE;
} }
evas_object_del(it->image); evas_object_del(it->image);
it->image = NULL; it->image = NULL;
@ -762,7 +762,7 @@ _item_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
static void static void
_pan_file_add(Evas_Object *obj, const char *file, Evas_Bool remote, Evas_Bool theme) _pan_file_add(Evas_Object *obj, const char *file, Eina_Bool remote, Eina_Bool theme)
{ {
Smart_Data *sd = evas_object_smart_data_get(obj); Smart_Data *sd = evas_object_smart_data_get(obj);
Item *it = calloc(1, sizeof(Item)); Item *it = calloc(1, sizeof(Item));

6
src/modules/illume/e_slipshelf.c
View File

@ -261,7 +261,7 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
} }
EAPI void EAPI void
e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Evas_Bool enabled) e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Eina_Bool enabled)
{ {
E_OBJECT_CHECK(ess); E_OBJECT_CHECK(ess);
E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE); E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE);
@ -326,7 +326,7 @@ e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Evas
} }
} }
EAPI Evas_Bool EAPI Eina_Bool
e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action) e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action)
{ {
E_OBJECT_CHECK(ess); E_OBJECT_CHECK(ess);
@ -354,7 +354,7 @@ e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action)
default: default:
break; break;
} }
return 0; return EINA_FALSE;
} }
EAPI void EAPI void

4
src/modules/illume/e_slipshelf.h
View File

@ -73,8 +73,8 @@ struct _E_Event_Slipshelf_Simple
EAPI int e_slipshelf_init(void); EAPI int e_slipshelf_init(void);
EAPI int e_slipshelf_shutdown(void); EAPI int e_slipshelf_shutdown(void);
EAPI E_Slipshelf *e_slipshelf_new(E_Zone *zone, const char *themedir); EAPI E_Slipshelf *e_slipshelf_new(E_Zone *zone, const char *themedir);
EAPI void e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Evas_Bool enabled); EAPI void e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Eina_Bool enabled);
EAPI Evas_Bool e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action); EAPI Eina_Bool e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action);
EAPI void e_slipshelf_action_callback_set(E_Slipshelf *ess, E_Slipshelf_Action action, void (*func) (const void *data, E_Slipshelf *ess, E_Slipshelf_Action action), const void *data); EAPI void e_slipshelf_action_callback_set(E_Slipshelf *ess, E_Slipshelf_Action action, void (*func) (const void *data, E_Slipshelf *ess, E_Slipshelf_Action action), const void *data);
EAPI void e_slipshelf_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h); EAPI void e_slipshelf_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h);
EAPI void e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title); EAPI void e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title);