aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-06-17 13:46:54 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-06-17 13:46:54 +0000
commitc82f19e052c520555d6b92d7c4a2389471a3128c (patch)
tree43f7abfcc10c3c0d0a99dc4c51f345585e684995
parentback to svn soname (diff)
downloadenlightenment-c82f19e052c520555d6b92d7c4a2389471a3128c.tar.gz
* e: Remove all reference to Evas_Data and move to Eina_Bool.
SVN revision: 41080
-rw-r--r--src/bin/e_exec.c8
-rw-r--r--src/bin/e_filereg.c12
-rw-r--r--src/bin/e_filereg.h2
-rw-r--r--src/bin/e_fm_mime.h8
-rw-r--r--src/bin/e_fm_op.c2
-rw-r--r--src/bin/e_int_menus.c4
-rw-r--r--src/bin/e_intl.c2
-rw-r--r--src/bin/e_main.c4
-rw-r--r--src/bin/e_menu.c18
-rw-r--r--src/bin/e_scrollframe.c10
-rw-r--r--src/bin/e_scrollframe.h6
-rw-r--r--src/bin/e_sys.h2
-rw-r--r--src/bin/e_theme.c8
-rw-r--r--src/bin/e_widget_toolbar.c28
-rw-r--r--src/bin/e_widget_toolbar.h4
-rw-r--r--src/modules/conf_fonts/e_int_config_fonts.c4
-rw-r--r--src/modules/conf_wallpaper2/e_int_config_wallpaper.c50
-rw-r--r--src/modules/illume/e_slipshelf.c6
-rw-r--r--src/modules/illume/e_slipshelf.h4
19 files changed, 88 insertions, 94 deletions
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index 3ee31a330..436aa85e8 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -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_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 _fill_data(E_Config_Dialog_Data *cfdata);
@@ -363,7 +363,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
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_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->desktop = inst->desktop;
- return 0;
+ return EINA_FALSE;
}
- return 1;
+ return EINA_TRUE;
}
static void
diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c
index ef342e943..eb12beaea 100644
--- a/src/bin/e_filereg.c
+++ b/src/bin/e_filereg.c
@@ -76,26 +76,26 @@ e_filereg_deregister(const char *path)
}
}
-EAPI Evas_Bool
+EAPI Eina_Bool
e_filereg_file_protected(const char *path)
{
Filereg_Item *fi = NULL;
fi = eina_hash_find(_e_filereg, path);
- if (!fi) return 0;
- else return 1;
+ if (!fi) return EINA_FALSE;
+ return EINA_TRUE;
}
/* Private Functions */
-static Evas_Bool
+static Eina_Bool
_filereg_hash_cb_free(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__,
void *data, void *fdata __UNUSED__)
{
Filereg_Item *fi;
fi = data;
- if (!fi) return 1;
+ if (!fi) return EINA_TRUE;
if (fi->path) eina_stringshare_del(fi->path);
E_FREE(fi);
- return 1;
+ return EINA_TRUE;
}
diff --git a/src/bin/e_filereg.h b/src/bin/e_filereg.h
index 40a95bd66..98b794d5d 100644
--- a/src/bin/e_filereg.h
+++ b/src/bin/e_filereg.h
@@ -12,7 +12,7 @@ EAPI int e_filereg_shutdown(void);
EAPI int e_filereg_register(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
diff --git a/src/bin/e_fm_mime.h b/src/bin/e_fm_mime.h
index 727e3ebb1..eba2a2dbb 100644
--- a/src/bin/e_fm_mime.h
+++ b/src/bin/e_fm_mime.h
@@ -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 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 Evas_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 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_mime_add(E_Fm2_Mime_Handler *handler, const char *mime);
+EAPI Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob);
+EAPI Eina_Bool e_fm2_mime_handler_call(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_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);
diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index fe9ce49af..f04fbde16 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -18,8 +18,6 @@
#include <errno.h>
#include <limits.h>
-#include <Evas_Data.h>
-
#include <Ecore.h>
#include <Ecore_File.h>
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 5e3769b42..469951a6b 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -214,7 +214,7 @@ e_int_menus_main_new(void)
l = _e_int_menus_augmentation_find("main/9");
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)
{
separator = 1;
@@ -223,7 +223,7 @@ e_int_menus_main_new(void)
_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 (!separator)
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index 9713342e0..e84b6e44b 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -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 int _e_intl_locale_validate(const char *locale);
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 */
static int _e_intl_cb_exit(void *data, int type, void *event);
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index a372fc597..3b524ae11 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -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_level = 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;
@@ -314,7 +314,7 @@ main(int argc, char **argv)
}
else if (!strcmp(argv[i], "-locked"))
{
- locked = 1;
+ locked = EINA_TRUE;
puts("enlightenment will start with desklock on.");
}
else if ((!strcmp(argv[i], "-h")) ||
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index f3a43366f..b355521c3 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -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 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 */
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 */
if (m->category)
{
- cat = evas_hash_find(_e_menu_categories, m->category);
+ cat = eina_hash_find(_e_menu_categories, m->category);
if (cat)
{
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)
{
- Eina_List *l;
+ E_Menu_Category_Callback *cb;
E_Menu_Category *cat;
cat = (E_Menu_Category *) data;
- l = (Eina_List *) cat->callbacks;
- while (l)
- {
- free(l->data); /* free the callback struct */
- l = eina_list_remove_list(l, l);
- }
+ EINA_LIST_FREE(cat->callbacks, cb)
+ free(cb); /* free the callback struct */
free(cat);
- return 1;
+ return EINA_TRUE;
}
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index fa5d8b69b..a4368d2b8 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -56,7 +56,7 @@ struct _E_Smart_Data
} pan_func;
struct
{
- Evas_Bool forced : 1;
+ Eina_Bool forced : 1;
} thumbscroll;
unsigned char hbar_visible : 1;
@@ -349,21 +349,21 @@ e_scrollframe_edje_object_get(Evas_Object *obj)
}
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;
sd->one_dir_at_a_time = single_dir;
}
-EAPI Evas_Bool
+EAPI Eina_Bool
e_scrollframe_single_dir_get(Evas_Object *obj)
{
- API_ENTRY return 0;
+ API_ENTRY return EINA_FALSE;
return sd->one_dir_at_a_time;
}
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;
sd->thumbscroll.forced = forced;
diff --git a/src/bin/e_scrollframe.h b/src/bin/e_scrollframe.h
index 437abc70e..bcde1f0fb 100644
--- a/src/bin/e_scrollframe.h
+++ b/src/bin/e_scrollframe.h
@@ -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_get (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar);
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 Evas_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_single_dir_set (Evas_Object *obj, Eina_Bool single_dir);
+EAPI Eina_Bool e_scrollframe_single_dir_get (Evas_Object *obj);
+EAPI void e_scrollframe_thumbscroll_force (Evas_Object *obj, Eina_Bool forced);
#endif
#endif
diff --git a/src/bin/e_sys.h b/src/bin/e_sys.h
index 188dc1158..94ab976fc 100644
--- a/src/bin/e_sys.h
+++ b/src/bin/e_sys.h
@@ -27,7 +27,7 @@ struct _E_Sys_Con_Action
const char *button_name;
void (*func) (void *data);
const void *data;
- Evas_Bool disabled : 1;
+ Eina_Bool disabled : 1;
};
#else
diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c
index 25618fd8b..91aab1d5f 100644
--- a/src/bin/e_theme.c
+++ b/src/bin/e_theme.c
@@ -466,7 +466,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
}
/* 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_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);
}
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)
{
eina_stringshare_del(key);
- return 1;
+ return EINA_TRUE;
}
static void
diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index ac322e603..acbc94bc1 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -10,8 +10,8 @@ struct _E_Widget_Data
Evas_Object *o_base, *o_box, *o_scrollframe0;
int icon_w, icon_h;
Eina_List *items;
- Evas_Bool scrollable : 1;
- Evas_Bool focus_steal : 1;
+ Eina_Bool scrollable : 1;
+ Eina_Bool focus_steal : 1;
};
struct _Item
@@ -19,7 +19,7 @@ struct _Item
Evas_Object *o_toolbar, *o_base, *o_icon;
void (*func) (void *data1, void *data2);
const void *data1, *data2;
- Evas_Bool selected : 1;
+ Eina_Bool selected : 1;
};
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);
wd->icon_w = icon_w;
wd->icon_h = icon_h;
- wd->focus_steal = 1;
+ wd->focus_steal = EINA_TRUE;
o = e_scrollframe_add(evas);
wd->o_base = o;
@@ -167,7 +167,7 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num)
{
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_icon, "e,state,selected", "e");
_item_show(it);
@@ -178,7 +178,7 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num)
{
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_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
-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;
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
-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;
@@ -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_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
- wd->focus_steal = 1;
+ wd->focus_steal = EINA_TRUE;
}
else
{
evas_object_event_callback_del(e_scrollframe_edje_object_get(wd->o_base),
EVAS_CALLBACK_MOUSE_DOWN,
_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;
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_icon, "e,state,unselected", "e");
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_icon, "e,state,selected", "e");
_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))
{
- it->selected = 0;
+ it->selected = EINA_FALSE;
edje_object_signal_emit(it->o_base, "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_icon, "e,state,selected", "e");
_item_show(it2);
diff --git a/src/bin/e_widget_toolbar.h b/src/bin/e_widget_toolbar.h
index 1dfc13d93..dc3a2ca95 100644
--- a/src/bin/e_widget_toolbar.h
+++ b/src/bin/e_widget_toolbar.h
@@ -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_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_scrollable_set(Evas_Object *obj, Evas_Bool scrollable);
-EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Evas_Bool steal);
+EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable);
+EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal);
#endif
#endif
diff --git a/src/modules/conf_fonts/e_int_config_fonts.c b/src/modules/conf_fonts/e_int_config_fonts.c
index 39708b263..fd4d1015b 100644
--- a/src/modules/conf_fonts/e_int_config_fonts.c
+++ b/src/modules/conf_fonts/e_int_config_fonts.c
@@ -400,7 +400,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
return 1;
}
-static Evas_Bool
+static Eina_Bool
_font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata)
{
E_Config_Dialog_Data *cfdata;
@@ -410,7 +410,7 @@ _font_hash_cb(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void
efp = data;
cfdata->font_list = eina_list_append(cfdata->font_list, efp->name);
- return 1;
+ return EINA_TRUE;
}
static Evas_Object *
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
index 4d372aa67..f25a7a3fe 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
@@ -55,8 +55,8 @@ struct _Smart_Data
int id_num;
double seltime;
double selmove;
- Evas_Bool selin : 1;
- Evas_Bool selout : 1;
+ Eina_Bool selin : 1;
+ Eina_Bool selout : 1;
};
struct _Item
@@ -66,12 +66,12 @@ struct _Item
const char *file;
char *sort_id;
Evas_Object *frame, *image;
- Evas_Bool selected : 1;
- Evas_Bool have_thumb : 1;
- Evas_Bool do_thumb : 1;
- Evas_Bool remote : 1;
- Evas_Bool theme : 1;
- Evas_Bool visible : 1;
+ Eina_Bool selected : 1;
+ Eina_Bool have_thumb : 1;
+ Eina_Bool do_thumb : 1;
+ Eina_Bool remote : 1;
+ Eina_Bool theme : 1;
+ Eina_Bool visible : 1;
};
static Info *global_info = NULL;
@@ -308,7 +308,7 @@ _e_smart_reconfigure_do(void *data)
if (!it->do_thumb)
{
e_thumb_icon_begin(it->image);
- it->do_thumb = 1;
+ it->do_thumb = EINA_TRUE;
}
}
else
@@ -354,7 +354,7 @@ _e_smart_reconfigure_do(void *data)
yy + dy);
evas_object_resize(it->frame, it->w, it->h);
evas_object_show(it->frame);
- it->visible = 1;
+ it->visible = EINA_TRUE;
}
else
{
@@ -363,24 +363,24 @@ _e_smart_reconfigure_do(void *data)
if (it->do_thumb)
{
e_thumb_icon_end(it->image);
- it->do_thumb = 0;
+ it->do_thumb = EINA_FALSE;
}
evas_object_del(it->image);
it->image = NULL;
evas_object_del(it->frame);
it->frame = NULL;
}
- it->visible = 0;
+ it->visible = EINA_FALSE;
/*
if (it->have_thumb)
{
if (it->do_thumb)
{
e_thumb_icon_end(it->image);
- it->do_thumb = 0;
+ it->do_thumb = EINA_FALSE;
}
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));
edje_object_part_swallow(it->frame, "e.swallow.content", it->image);
evas_object_smart_callback_add(it->image, "e_thumb_gen", _thumb_gen, it);
@@ -599,13 +599,13 @@ _sel_anim(void *data)
{
if (sd->selout)
{
- sd->selin = 1;
- sd->selout = 0;
+ sd->selin = EINA_TRUE;
+ sd->selout = EINA_FALSE;
sd->seltime = ecore_loop_time_get();
return 1;
}
- sd->selout = 0;
- sd->selin = 0;
+ sd->selout = EINA_FALSE;
+ sd->selin = EINA_FALSE;
sd->animator = NULL;
return 0;
}
@@ -621,7 +621,7 @@ _sel_timer(void *data)
{
sd->seltime = ecore_time_get();
sd->animator = ecore_animator_add(_sel_anim, obj);
- sd->selin = 0;
+ sd->selin = EINA_FALSE;
}
sd->seltimer = NULL;
return 0;
@@ -642,7 +642,7 @@ _pan_sel(Evas_Object *obj, Item *it)
{
if (it2->selected) it2->selected = 0;
}
- it->selected = 1;
+ it->selected = EINA_TRUE;
if (sd->info->bg_file) free(sd->info->bg_file);
evas_object_hide(sd->info->mini);
if (it->file)
@@ -676,12 +676,12 @@ _pan_sel_up(Evas_Object *obj)
{
sd->seltime = ecore_loop_time_get();
sd->animator = ecore_animator_add(_sel_anim, obj);
- sd->selin = 1;
+ sd->selin = EINA_TRUE;
}
else
{
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);
}
}
- it->have_thumb = 1;
+ it->have_thumb = EINA_TRUE;
if (!it->visible)
{
if (it->do_thumb)
{
e_thumb_icon_end(it->image);
- it->do_thumb = 0;
+ it->do_thumb = EINA_FALSE;
}
evas_object_del(it->image);
it->image = NULL;
@@ -762,7 +762,7 @@ _item_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
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);
Item *it = calloc(1, sizeof(Item));
diff --git a/src/modules/illume/e_slipshelf.c b/src/modules/illume/e_slipshelf.c
index 64fde944c..590a413c4 100644
--- a/src/modules/illume/e_slipshelf.c
+++ b/src/modules/illume/e_slipshelf.c
@@ -261,7 +261,7 @@ 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)
+e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Eina_Bool enabled)
{
E_OBJECT_CHECK(ess);
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_OBJECT_CHECK(ess);
@@ -354,7 +354,7 @@ e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action)
default:
break;
}
- return 0;
+ return EINA_FALSE;
}
EAPI void
diff --git a/src/modules/illume/e_slipshelf.h b/src/modules/illume/e_slipshelf.h
index fdba9cf59..f96887cc3 100644
--- a/src/modules/illume/e_slipshelf.h
+++ b/src/modules/illume/e_slipshelf.h
@@ -73,8 +73,8 @@ struct _E_Event_Slipshelf_Simple
EAPI int e_slipshelf_init(void);
EAPI int e_slipshelf_shutdown(void);
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 Evas_Bool e_slipshelf_action_enabled_get(E_Slipshelf *ess, E_Slipshelf_Action action);
+EAPI void e_slipshelf_action_enabled_set(E_Slipshelf *ess, E_Slipshelf_Action action, Eina_Bool enabled);
+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_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);