forked from enlightenment/enlightenment
Fix function protos & functions for recent Evas_Hash changes to remove
compiler warnings. Fix some formatting in e_font. SVN revision: 33719
This commit is contained in:
parent
746ea5f85a
commit
f723e3499c
|
@ -57,7 +57,7 @@ static void _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int
|
|||
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(Evas_Hash *hash, const char *key, void *value, void *data);
|
||||
static Evas_Bool _e_exec_startup_id_pid_find(const Evas_Hash *hash, const char *key, 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);
|
||||
|
@ -352,10 +352,10 @@ _e_exec_cb_exit(void *data, int type, void *event)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_exec_startup_id_pid_find(Evas_Hash *hash, const char *key, void *value, void *data)
|
||||
_e_exec_startup_id_pid_find(const Evas_Hash *hash, const char *key, void *value, void *data)
|
||||
{
|
||||
E_Exec_Search *search;
|
||||
Evas_List *instances, *l;
|
||||
Evas_List *instances, *l;
|
||||
|
||||
search = data;
|
||||
instances = value;
|
||||
|
|
|
@ -17,7 +17,7 @@ struct _Filereg_Item
|
|||
int ref_count;
|
||||
};
|
||||
|
||||
static Evas_Bool _filereg_hash_cb_free(Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
|
||||
|
@ -86,7 +86,7 @@ e_filereg_file_protected(const char *path)
|
|||
|
||||
/* Private Functions */
|
||||
static Evas_Bool
|
||||
_filereg_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_filereg_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
Filereg_Item *fi;
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
*/
|
||||
#include "e.h"
|
||||
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_List *_e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str);
|
||||
//static Evas_Bool _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
//static Evas_List *_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str);
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static void _e_fm2_custom_file_info_load(void);
|
||||
static void _e_fm2_custom_file_info_save(void);
|
||||
static void _e_fm2_custom_file_info_free(void);
|
||||
|
@ -220,7 +220,7 @@ struct _E_Custom_List
|
|||
};
|
||||
|
||||
static Evas_Bool
|
||||
_e_fm2_custom_file_hash_foreach_list(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_fm2_custom_file_hash_foreach_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
struct _E_Custom_List *cl;
|
||||
|
||||
|
@ -245,7 +245,7 @@ _e_fm2_custom_hash_key_base_list(Evas_Hash *hash, const char *str)
|
|||
|
||||
/*
|
||||
static Evas_Bool
|
||||
_e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_fm2_custom_file_hash_foreach_sub_list(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
struct _E_Custom_List *cl;
|
||||
|
||||
|
@ -258,7 +258,7 @@ _e_fm2_custom_file_hash_foreach_sub_list(Evas_Hash *hash, const char *key, void
|
|||
|
||||
/*
|
||||
static Evas_List *
|
||||
_e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str)
|
||||
_e_fm2_custom_hash_key_sub_list(const Evas_Hash *hash, const char *str)
|
||||
{
|
||||
struct _E_Custom_List cl;
|
||||
|
||||
|
@ -271,7 +271,7 @@ _e_fm2_custom_hash_key_sub_list(Evas_Hash *hash, const char *str)
|
|||
*/
|
||||
|
||||
static Evas_Bool
|
||||
_e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_fm2_custom_file_hash_foreach(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
E_Fm2_Custom_File *cf;
|
||||
|
||||
|
@ -283,7 +283,7 @@ _e_fm2_custom_file_hash_foreach(Evas_Hash *hash, const char *key, void *data, vo
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_fm2_custom_file_hash_foreach_save(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_fm2_custom_file_hash_foreach_save(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
Eet_File *ef;
|
||||
E_Fm2_Custom_File *cf;
|
||||
|
|
|
@ -12,8 +12,8 @@ struct _E_Fm2_Mime_Handler_Tuple
|
|||
};
|
||||
|
||||
/* local subsystem functions */
|
||||
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata);
|
||||
|
||||
static Evas_Hash *icon_map = NULL;
|
||||
static Evas_Hash *_mime_handlers = NULL;
|
||||
|
@ -356,7 +356,7 @@ e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha
|
|||
/* local subsystem functions */
|
||||
/* used to loop a glob hash and determine if the glob handler matches the filename */
|
||||
static Evas_Bool
|
||||
_e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
|
||||
_e_fm2_mime_handler_glob_match_foreach(const Evas_Hash *hash __UNUSED__, const char *key, void *data, void *fdata)
|
||||
{
|
||||
E_Fm2_Mime_Handler_Tuple *tuple;
|
||||
Evas_List *handlers = NULL;
|
||||
|
@ -377,7 +377,7 @@ _e_fm2_mime_handler_glob_match_foreach(Evas_Hash *hash __UNUSED__, const char *k
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_fm_mime_icon_foreach(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
|
||||
_e_fm_mime_icon_foreach(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata)
|
||||
{
|
||||
Evas_List **freelist;
|
||||
|
||||
|
|
161
src/bin/e_font.c
161
src/bin/e_font.c
|
@ -5,7 +5,7 @@
|
|||
|
||||
#define E_TOK_STYLE ":style="
|
||||
|
||||
static Evas_Bool _font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _font_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Hash *_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name);
|
||||
static E_Font_Properties *_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font);
|
||||
static char _fn_buf[1024];
|
||||
|
@ -151,12 +151,12 @@ e_font_properties_free(E_Font_Properties *efp)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_font_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_font_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
E_Font_Properties *efp;
|
||||
|
||||
efp = data;
|
||||
e_font_properties_free(efp);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -177,74 +177,67 @@ e_font_fontconfig_name_parse(const char *font)
|
|||
static E_Font_Properties *
|
||||
_e_font_fontconfig_name_parse(Evas_Hash **font_hash, E_Font_Properties *efp, const char *font)
|
||||
{
|
||||
char *s1;
|
||||
char *s1;
|
||||
|
||||
s1 = strchr(font, ':');
|
||||
if (s1)
|
||||
s1 = strchr(font, ':');
|
||||
if (s1)
|
||||
{
|
||||
char *s2, *name, *style;
|
||||
int len;
|
||||
|
||||
len = s1 - font;
|
||||
name = calloc(sizeof(char), len + 1);
|
||||
strncpy(name, font, len);
|
||||
|
||||
/* Get subname (should be english) */
|
||||
s2 = strchr(name, ',');
|
||||
if (s2)
|
||||
{
|
||||
char *s2;
|
||||
char *name;
|
||||
char *style;
|
||||
int len;
|
||||
|
||||
len = s1 - font;
|
||||
|
||||
name = calloc(sizeof(char), len + 1);
|
||||
len = s2 - name;
|
||||
name = realloc(name, sizeof(char) * len + 1);
|
||||
memset(name, 0, sizeof(char) * len + 1);
|
||||
strncpy(name, font, len);
|
||||
}
|
||||
|
||||
/* Get subname (should be english) */
|
||||
s2 = strchr(name, ',');
|
||||
if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
|
||||
{
|
||||
style = s1 + strlen(E_TOK_STYLE);
|
||||
|
||||
if (font_hash) efp = evas_hash_find(*font_hash, name);
|
||||
if (efp == NULL)
|
||||
{
|
||||
efp = calloc(1, sizeof(E_Font_Properties));
|
||||
efp->name = evas_stringshare_add(name);
|
||||
if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
|
||||
}
|
||||
s2 = strchr(style, ',');
|
||||
if (s2)
|
||||
{
|
||||
len = s2 - name;
|
||||
char *style_old;
|
||||
|
||||
name = realloc(name, sizeof(char) * len + 1);
|
||||
memset(name, 0, sizeof(char) * len + 1);
|
||||
strncpy(name, font, len);
|
||||
len = s2 - style;
|
||||
style_old = style;
|
||||
style = calloc(sizeof(char), len + 1);
|
||||
strncpy(style, style_old, len);
|
||||
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
|
||||
free(style);
|
||||
}
|
||||
|
||||
if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
|
||||
{
|
||||
style = s1 + strlen(E_TOK_STYLE);
|
||||
|
||||
if (font_hash) efp = evas_hash_find(*font_hash, name);
|
||||
if (efp == NULL)
|
||||
{
|
||||
efp = calloc(1, sizeof(E_Font_Properties));
|
||||
efp->name = evas_stringshare_add(name);
|
||||
if (font_hash) *font_hash = evas_hash_add(*font_hash, name, efp);
|
||||
}
|
||||
s2 = strchr(style, ',');
|
||||
if (s2)
|
||||
{
|
||||
char *style_old;
|
||||
len = s2 - style;
|
||||
|
||||
style_old = style;
|
||||
style = calloc(sizeof(char), len + 1);
|
||||
strncpy(style, style_old, len);
|
||||
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
|
||||
free(style);
|
||||
}
|
||||
else
|
||||
{
|
||||
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
|
||||
}
|
||||
}
|
||||
|
||||
free(name);
|
||||
else
|
||||
efp->styles = evas_list_append(efp->styles, evas_stringshare_add(style));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (font_hash) efp = evas_hash_find(*font_hash, font);
|
||||
if (efp == NULL)
|
||||
{
|
||||
efp = calloc(1, sizeof(E_Font_Properties));
|
||||
efp->name = evas_stringshare_add(font);
|
||||
if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
|
||||
}
|
||||
}
|
||||
return efp;
|
||||
free(name);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (font_hash) efp = evas_hash_find(*font_hash, font);
|
||||
if (efp == NULL)
|
||||
{
|
||||
efp = calloc(1, sizeof(E_Font_Properties));
|
||||
efp->name = evas_stringshare_add(font);
|
||||
if (font_hash) *font_hash = evas_hash_add(*font_hash, font, efp);
|
||||
}
|
||||
}
|
||||
return efp;
|
||||
}
|
||||
|
||||
|
||||
|
@ -252,7 +245,6 @@ static Evas_Hash *
|
|||
_e_font_available_hash_add(Evas_Hash *font_hash, const char *full_name)
|
||||
{
|
||||
_e_font_fontconfig_name_parse(&font_hash, NULL, full_name);
|
||||
|
||||
return font_hash;
|
||||
}
|
||||
|
||||
|
@ -281,9 +273,7 @@ e_font_available_list_parse(Evas_List *list)
|
|||
font_hash = _e_font_available_hash_add(font_hash, "Monospace:style=Bold Oblique");
|
||||
|
||||
for (next = list; next; next = next->next)
|
||||
{
|
||||
font_hash = _e_font_available_hash_add(font_hash, next->data);
|
||||
}
|
||||
font_hash = _e_font_available_hash_add(font_hash, next->data);
|
||||
|
||||
return font_hash;
|
||||
}
|
||||
|
@ -293,12 +283,11 @@ EAPI const char *
|
|||
e_font_fontconfig_name_get(const char *name, const char *style)
|
||||
{
|
||||
char buf[256];
|
||||
|
||||
if (name == NULL) return NULL;
|
||||
if (style == NULL || style[0] == 0) return evas_stringshare_add(name);
|
||||
|
||||
snprintf(buf, 256, "%s"E_TOK_STYLE"%s", name, style);
|
||||
return evas_stringshare_add(buf);
|
||||
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
@ -309,9 +298,8 @@ e_font_fallback_clear(void)
|
|||
while (e_config->font_fallbacks)
|
||||
{
|
||||
eff = e_config->font_fallbacks->data;
|
||||
e_config->font_fallbacks = evas_list_remove_list(
|
||||
e_config->font_fallbacks,
|
||||
e_config->font_fallbacks);
|
||||
e_config->font_fallbacks =
|
||||
evas_list_remove_list(e_config->font_fallbacks, e_config->font_fallbacks);
|
||||
if (eff->name) evas_stringshare_del(eff->name);
|
||||
E_FREE(eff);
|
||||
}
|
||||
|
@ -353,8 +341,8 @@ e_font_fallback_remove(const char *font)
|
|||
eff = evas_list_data(next);
|
||||
if (!strcmp(eff->name, font))
|
||||
{
|
||||
e_config->font_fallbacks = evas_list_remove_list(
|
||||
e_config->font_fallbacks, next);
|
||||
e_config->font_fallbacks =
|
||||
evas_list_remove_list(e_config->font_fallbacks, next);
|
||||
if (eff->name) evas_stringshare_del(eff->name);
|
||||
E_FREE(eff);
|
||||
break;
|
||||
|
@ -384,10 +372,10 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
|
|||
efd->font = evas_stringshare_add(font);
|
||||
efd->size = size;
|
||||
/* move to the front of the list */
|
||||
e_config->font_defaults = evas_list_remove_list(
|
||||
e_config->font_defaults, next);
|
||||
e_config->font_defaults = evas_list_prepend(
|
||||
e_config->font_defaults, efd);
|
||||
e_config->font_defaults =
|
||||
evas_list_remove_list(e_config->font_defaults, next);
|
||||
e_config->font_defaults =
|
||||
evas_list_prepend(e_config->font_defaults, efd);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -417,17 +405,15 @@ e_font_default_get(const char *text_class)
|
|||
if (!strcmp(efd->text_class, text_class))
|
||||
{
|
||||
/* move to the front of the list */
|
||||
e_config->font_defaults = evas_list_remove_list(
|
||||
e_config->font_defaults, next);
|
||||
e_config->font_defaults = evas_list_prepend(
|
||||
e_config->font_defaults, efd);
|
||||
e_config->font_defaults =
|
||||
evas_list_remove_list(e_config->font_defaults, next);
|
||||
e_config->font_defaults =
|
||||
evas_list_prepend(e_config->font_defaults, efd);
|
||||
return efd;
|
||||
}
|
||||
if (!strcmp(efd->text_class, "default"))
|
||||
defd = efd;
|
||||
if (!strcmp(efd->text_class, "default")) defd = efd;
|
||||
}
|
||||
if (!defd)
|
||||
defd = efd;
|
||||
if (!defd) defd = efd;
|
||||
return defd;
|
||||
}
|
||||
|
||||
|
@ -443,8 +429,8 @@ e_font_default_remove(const char *text_class)
|
|||
efd = evas_list_data(next);
|
||||
if (!strcmp(efd->text_class, text_class))
|
||||
{
|
||||
e_config->font_defaults = evas_list_remove_list(
|
||||
e_config->font_defaults, next);
|
||||
e_config->font_defaults =
|
||||
evas_list_remove_list(e_config->font_defaults, next);
|
||||
if (efd->text_class) evas_stringshare_del(efd->text_class);
|
||||
if (efd->font) evas_stringshare_del(efd->font);
|
||||
E_FREE(efd);
|
||||
|
@ -510,4 +496,3 @@ e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret)
|
|||
if (size_ret) *size_ret = efd->size;
|
||||
return _fn_buf;
|
||||
}
|
||||
|
||||
|
|
|
@ -55,16 +55,16 @@ static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas,
|
|||
static void _fill_type_hash (void);
|
||||
static void _load_modules (const char *dir);
|
||||
static void _fill_list (Evas_Object *obj, int enabled);
|
||||
static Evas_Bool _types_hash_cb_free (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _types_hash_cb_free (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
static Evas_Bool _mod_hash_cb_free (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_cb_free (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
static Evas_Bool _mod_hash_avail_list (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_avail_list (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata);
|
||||
static Evas_Bool _mod_hash_load_list (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_load_list (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata);
|
||||
static int _mod_list_sort (void *data1, void *data2);
|
||||
|
@ -72,16 +72,16 @@ static void _list_widget_load (Evas_Object *obj, Evas_List *list);
|
|||
static void _avail_list_cb_change (void *data, Evas_Object *obj);
|
||||
static void _load_list_cb_change (void *data, Evas_Object *obj);
|
||||
static void _unselect_all_modules (void);
|
||||
static Evas_Bool _mod_hash_unselect (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_unselect (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
static void _select_all_modules (Evas_Object *obj, void *data);
|
||||
static void _btn_cb_unload (void *data, void *data2);
|
||||
static void _btn_cb_load (void *data, void *data2);
|
||||
static Evas_Bool _mod_hash_load (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_load (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
static Evas_Bool _mod_hash_unload (Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _mod_hash_unload (const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
static void _enable_modules (int enable);
|
||||
|
@ -346,7 +346,7 @@ _fill_list(Evas_Object *obj, int enabled)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_types_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_types_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFType *type = NULL;
|
||||
|
@ -366,7 +366,7 @@ _types_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_cb_free(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFModule *mod = NULL;
|
||||
|
@ -383,7 +383,7 @@ _mod_hash_cb_free(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_avail_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_avail_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata)
|
||||
{
|
||||
Evas_List **l;
|
||||
|
@ -397,7 +397,7 @@ _mod_hash_avail_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_load_list(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_load_list(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata)
|
||||
{
|
||||
Evas_List **l;
|
||||
|
@ -525,7 +525,7 @@ _unselect_all_modules(void)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_unselect(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_unselect(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFModule *mod = NULL;
|
||||
|
@ -617,7 +617,7 @@ _enable_modules(int enable)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_load(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_load(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFModule *mod = NULL;
|
||||
|
@ -634,7 +634,7 @@ _mod_hash_load(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_mod_hash_unload(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_mod_hash_unload(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFModule *mod = NULL;
|
||||
|
|
|
@ -47,7 +47,7 @@ static Evas_List *_e_intl_locale_system_locales_get(void);
|
|||
static Evas_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(Evas_Hash *language_hash);
|
||||
static Evas_Bool _e_intl_locale_hash_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_intl_locale_hash_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
|
||||
/* Input Method Configuration and Management */
|
||||
static int _e_intl_cb_exit(void *data, int type, void *event);
|
||||
|
@ -451,7 +451,7 @@ _e_intl_locale_hash_free(Evas_Hash *locale_hash)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_intl_locale_hash_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
_e_intl_locale_hash_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
free(data);
|
||||
return 1;
|
||||
|
|
|
@ -14,7 +14,7 @@ static int _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev
|
|||
static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
|
||||
static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
|
||||
|
||||
static Evas_Bool _e_manager_frame_extents_free_cb(Evas_Hash *hash __UNUSED__,
|
||||
static Evas_Bool _e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__,
|
||||
const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__);
|
||||
#if 0 /* use later - maybe */
|
||||
|
@ -776,7 +776,7 @@ _e_manager_cb_screensaver_notify(void *data, int ev_type __UNUSED__, void *ev)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_manager_frame_extents_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
_e_manager_frame_extents_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__,
|
||||
void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
free(data);
|
||||
|
|
|
@ -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(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
|
||||
/* local subsystem globals */
|
||||
static Ecore_X_Window _e_menu_win = 0;
|
||||
|
@ -2867,7 +2867,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
|
|||
|
||||
|
||||
static Evas_Bool
|
||||
_e_menu_categories_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_menu_categories_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
Evas_List *l;
|
||||
E_Menu_Category *cat;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
/* local subsystem functions */
|
||||
static void _e_path_free(E_Path *ep);
|
||||
static void _e_path_cache_free(E_Path *ep);
|
||||
static Evas_Bool _e_path_cache_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_path_cache_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
|
||||
/* externally accessible functions */
|
||||
EAPI E_Path *
|
||||
|
@ -387,7 +387,7 @@ _e_path_cache_free(E_Path *ep)
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_path_cache_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
_e_path_cache_free_cb(const Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
evas_stringshare_del(data);
|
||||
return 1;
|
||||
|
|
|
@ -13,8 +13,8 @@ struct _E_Theme_Result
|
|||
Evas_Hash *quickfind;
|
||||
};
|
||||
|
||||
static Evas_Bool _e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_theme_mappings_quickfind_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static Evas_Bool _e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata);
|
||||
static void _e_theme_category_register(const char *category);
|
||||
static Evas_List *_e_theme_collection_item_register(Evas_List *list, const char *name);
|
||||
static Evas_List *_e_theme_collection_items_find(const char *base, const char *collname);
|
||||
|
@ -495,7 +495,7 @@ e_theme_handler_test(Evas_Object *obj, const char *path, void *data)
|
|||
|
||||
/* local subsystem functions */
|
||||
static Evas_Bool
|
||||
_e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_theme_mappings_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
E_Theme_Result *res;
|
||||
|
||||
|
@ -512,7 +512,7 @@ _e_theme_mappings_free_cb(Evas_Hash *hash, const char *key, void *data, void *fd
|
|||
}
|
||||
|
||||
static Evas_Bool
|
||||
_e_theme_mappings_quickfind_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
_e_theme_mappings_quickfind_free_cb(const Evas_Hash *hash, const char *key, void *data, void *fdata)
|
||||
{
|
||||
evas_stringshare_del(key);
|
||||
return 1;
|
||||
|
|
Loading…
Reference in New Issue