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

cleanup. EAPI no longer required 

SVN revision: 49134
This commit is contained in:
Hannes Janetzek 2010-05-22 08:05:25 +00:00
parent 97529addef
commit 793c4ae7ce
5 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/modules/everything/e_mod_main.c
View File

@ -36,10 +36,9 @@ static E_Config_DD *plugin_setting_edd = NULL;
static Ecore_Timer *cleanup_timer;
EAPI int _e_module_evry_log_dom = -1;
int _e_module_evry_log_dom = -1;
EAPI Evry_Config *evry_conf = NULL;
Evry_Config *evry_conf = NULL;
EAPI int EVRY_EVENT_ITEM_SELECT;
EAPI int EVRY_EVENT_ITEM_CHANGED;
@ -64,41 +63,6 @@ EAPI E_Module_Api e_modapi =
static Eina_List *_evry_types = NULL;
EAPI Evry_Type
evry_type_register(const char *type)
{
const char *t = eina_stringshare_add(type);
Evry_Type ret = 0;
const char *i;
Eina_List *l;
EINA_LIST_FOREACH(_evry_types, l, i)
{
if (i == t) break;
ret++;
}
if(!l)
{
_evry_types = eina_list_append(_evry_types, t);
return ret;
}
eina_stringshare_del(t);
return ret;
}
EAPI const char *
evry_type_get(Evry_Type type)
{
const char *ret = eina_list_nth(_evry_types, type);
if (!ret)
return eina_stringshare_add("");
return ret;
}
EAPI void *
e_modapi_init(E_Module *m)
{
@ -283,6 +247,82 @@ e_modapi_save(E_Module *m __UNUSED__)
return 1;
}
/***************************************************************************/
Evry_Type
evry_type_register(const char *type)
{
const char *t = eina_stringshare_add(type);
Evry_Type ret = 0;
const char *i;
Eina_List *l;
EINA_LIST_FOREACH(_evry_types, l, i)
{
if (i == t) break;
ret++;
}
if(!l)
{
_evry_types = eina_list_append(_evry_types, t);
return ret;
}
eina_stringshare_del(t);
return ret;
}
const char *
evry_type_get(Evry_Type type)
{
const char *ret = eina_list_nth(_evry_types, type);
if (!ret)
return eina_stringshare_add("");
return ret;
}
int evry_api_version_check(int version)
{
if (EVRY_API_VERSION == version)
return 1;
ERR("module API is %d, required is %d", version, EVRY_API_VERSION);
return 0;
}
static int
_evry_cb_view_sort(const void *data1, const void *data2)
{
const Evry_View *v1 = data1;
const Evry_View *v2 = data2;
return v1->priority - v2->priority;
}
void
evry_view_register(Evry_View *view, int priority)
{
view->priority = priority;
evry_conf->views = eina_list_append(evry_conf->views, view);
evry_conf->views = eina_list_sort(evry_conf->views,
eina_list_count(evry_conf->views),
_evry_cb_view_sort);
}
void
evry_view_unregister(Evry_View *view)
{
evry_conf->views = eina_list_remove(evry_conf->views, view);
}
/***************************************************************************/
static int
_cleanup_history(void *data)
{
@ -479,41 +519,3 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
e_util_menu_item_theme_icon_set(mi, "system-run");
e_menu_item_callback_set(mi, _e_mod_run_cb, NULL);
}
EAPI int evry_api_version_check(int version)
{
if (EVRY_API_VERSION == version)
return 1;
ERR("module API is %d, required is %d", version, EVRY_API_VERSION);
return 0;
}
static int
_evry_cb_view_sort(const void *data1, const void *data2)
{
const Evry_View *v1 = data1;
const Evry_View *v2 = data2;
return v1->priority - v2->priority;
}
EAPI void
evry_view_register(Evry_View *view, int priority)
{
view->priority = priority;
evry_conf->views = eina_list_append(evry_conf->views, view);
evry_conf->views = eina_list_sort(evry_conf->views,
eina_list_count(evry_conf->views),
_evry_cb_view_sort);
}
EAPI void
evry_view_unregister(Evry_View *view)
{
evry_conf->views = eina_list_remove(evry_conf->views, view);
}

10
src/modules/everything/evry_history.c
View File

@ -187,7 +187,7 @@ evry_history_free(void)
E_CONFIG_DD_FREE(hist_edd);
}
EAPI void
void
evry_history_load(void)
{
if (evry_hist) return;
@ -214,7 +214,7 @@ evry_history_load(void)
}
EAPI void
void
evry_history_unload(void)
{
if (!evry_hist) return;
@ -228,7 +228,7 @@ evry_history_unload(void)
evry_hist = NULL;
}
EAPI History_Types *
History_Types *
evry_history_types_get(Evry_Type _type)
{
History_Types *ht;
@ -254,7 +254,7 @@ evry_history_types_get(Evry_Type _type)
return ht;
}
EAPI History_Item *
History_Item *
evry_history_item_add(Evry_Item *it, const char *ctxt, const char *input)
{
History_Entry *he;
@ -350,7 +350,7 @@ evry_history_item_add(Evry_Item *it, const char *ctxt, const char *input)
return hi;
}
EAPI int
int
evry_history_item_usage_set(Evry_Item *it, const char *input, const char *ctxt)
{
History_Entry *he;

9
src/modules/everything/evry_plugin.c
View File

@ -47,7 +47,7 @@ _evry_plugin_free(Evry_Item *it)
E_FREE(p);
}
EAPI Evry_Plugin *
Evry_Plugin *
evry_plugin_new(Evry_Plugin *base, const char *name, const char *label,
const char *icon, Evry_Type item_type,
Evry_Plugin *(*begin) (Evry_Plugin *p, const Evry_Item *item),
@ -85,7 +85,7 @@ evry_plugin_new(Evry_Plugin *base, const char *name, const char *label,
return p;
}
EAPI void
void
evry_plugin_free(Evry_Plugin *p)
{
evry_item_free(EVRY_ITEM(p));
@ -119,8 +119,7 @@ _evry_plugin_action_browse(Evry_Action *act)
return 0;
}
/* TODO make int return */
EAPI int
int
evry_plugin_register(Evry_Plugin *p, int type, int priority)
{
Eina_List *l;
@ -196,7 +195,7 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
return new_conf;
}
EAPI void
void
evry_plugin_unregister(Evry_Plugin *p)
{
DBG("%s", p->name);

24
src/modules/everything/evry_util.c
View File

@ -9,7 +9,7 @@ static int home_dir_len;
static char dir_buf[1024];
static char thumb_buf[4096];
EAPI void
void
evry_util_file_detail_set(Evry_Item_File *file)
{
char *dir = NULL;
@ -49,7 +49,7 @@ evry_util_file_detail_set(Evry_Item_File *file)
E_FREE(dir);
}
EAPI int
int
evry_fuzzy_match(const char *str, const char *match)
{
const char *p, *m, *next;
@ -245,13 +245,13 @@ _evry_fuzzy_match_sort_cb(const void *data1, const void *data2)
return 0;
}
EAPI Eina_List *
Eina_List *
evry_fuzzy_match_sort(Eina_List *items)
{
return eina_list_sort(items, -1, _evry_fuzzy_match_sort_cb);
}
EAPI int
int
evry_items_sort_func(const void *data1, const void *data2)
{
const Evry_Item *it1 = data1;
@ -349,7 +349,7 @@ evry_items_sort_func(const void *data1, const void *data2)
return strcasecmp(it1->label, it2->label);
}
EAPI int
int
evry_util_plugin_items_add(Evry_Plugin *p, Eina_List *items, const char *input,
int match_detail, int set_usage)
{
@ -430,7 +430,7 @@ _evry_icon_fdo_set(Evas_Object *obj, const char *icon)
return 1;
}
EAPI Evas_Object *
Evas_Object *
evry_icon_theme_get(const char *icon, Evas *e)
{
Evas_Object *o = e_icon_add(e);
@ -480,7 +480,7 @@ _evry_icon_mime_theme_get(const char *mime, Evas *e)
return NULL;
}
EAPI Evas_Object *
Evas_Object *
evry_icon_mime_get(const char *mime, Evas *e)
{
Evas_Object *o = NULL;
@ -577,7 +577,7 @@ evry_util_icon_get(Evry_Item *it, Evas *e)
}
EAPI int
int
evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
{
E_Zone *zone;
@ -685,7 +685,7 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
*/
#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
EAPI char *
char *
evry_util_url_unescape(const char *string, int length)
{
int alloc = (length?length:(int)strlen(string))+1;
@ -830,7 +830,7 @@ evry_file_path_get(Evry_Item_File *file)
return file->path;
}
EAPI const char*
const char*
evry_file_url_get(Evry_Item_File *file)
{
char dest[PATH_MAX * 3 + 7];
@ -873,7 +873,7 @@ _cb_free_item_changed(void *data, void *event)
E_FREE(ev);
}
EAPI void
void
evry_item_changed(Evry_Item *it, int icon, int selected)
{
Evry_Event_Item_Changed *ev;
@ -888,7 +888,7 @@ evry_item_changed(Evry_Item *it, int icon, int selected)
static char thumb_buf[4096];
static const char hex[] = "0123456789abcdef";
EAPI char *
char *
evry_util_md5_sum(const char *str)
{
MD5_CTX ctx;

4
src/modules/everything/evry_view_plugin_tabs.c
View File

@ -384,7 +384,7 @@ _tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
}
EAPI Tab_View *
Tab_View *
evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
{
Tab_View *v;
@ -409,7 +409,7 @@ evry_tab_view_new(Evry_View *view, const Evry_State *s, Evas *e)
return v;
}
EAPI void
void
evry_tab_view_free(Tab_View *v)
{
Tab *tab;