Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_exec.c e_filereg.c e_fm_custom.c e_fm_mime.c e_font.c
e_int_config_modules.c e_intl.c e_manager.c e_menu.c e_path.c
e_theme.c
Log Message:
Fix function protos & functions for recent Evas_Hash changes to remove
compiler warnings.
Fix some formatting in e_font.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_exec.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_exec.c 25 Aug 2007 07:39:57 -0000 1.9
+++ e_exec.c 9 Feb 2008 22:41:30 -0000 1.10
@@ -57,7 +57,7 @@
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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_filereg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_filereg.c 21 Aug 2007 22:35:45 -0000 1.3
+++ e_filereg.c 9 Feb 2008 22:41:30 -0000 1.4
@@ -17,7 +17,7 @@
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 @@
/* 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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_custom.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_fm_custom.c 11 Jan 2008 07:33:55 -0000 1.9
+++ e_fm_custom.c 9 Feb 2008 22:41:30 -0000 1.10
@@ -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 @@
};
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 @@
/*
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 @@
/*
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 @@
*/
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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_mime.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_fm_mime.c 16 Oct 2007 11:07:52 -0000 1.29
+++ e_fm_mime.c 9 Feb 2008 22:41:30 -0000 1.30
@@ -12,8 +12,8 @@
};
/* 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 @@
/* 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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_font.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_font.c 3 May 2007 23:19:40 -0000 1.23
+++ e_font.c 9 Feb 2008 22:41:30 -0000 1.24
@@ -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 @@
}
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 @@
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)
- {
- char *s2;
- char *name;
- char *style;
- int len;
-
- len = s1 - font;
+ s1 = strchr(font, ':');
+ if (s1)
+ {
+ char *s2, *name, *style;
+ int len;
- name = calloc(sizeof(char), len + 1);
+ len = s1 - font;
+ name = calloc(sizeof(char), len + 1);
+ strncpy(name, font, len);
+
+ /* Get subname (should be english) */
+ s2 = strchr(name, ',');
+ if (s2)
+ {
+ 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 (s2)
- {
- len = s2 - name;
+ if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
+ {
+ style = s1 + strlen(E_TOK_STYLE);
- name = realloc(name, sizeof(char) * len + 1);
- memset(name, 0, sizeof(char) * len + 1);
- strncpy(name, font, len);
+ 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);
}
-
- if (strncmp(s1, E_TOK_STYLE, strlen(E_TOK_STYLE)) == 0)
+ s2 = strchr(style, ',');
+ if (s2)
{
- style = s1 + strlen(E_TOK_STYLE);
+ char *style_old;
- 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));
- }
+ 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);
}
-
- 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 @@
_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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
if (size_ret) *size_ret = efd->size;
return _fn_buf;
}
-
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_int_config_modules.c 30 Dec 2007 21:20:41 -0000 1.82
+++ e_int_config_modules.c 9 Feb 2008 22:41:30 -0000 1.83
@@ -55,16 +55,16 @@
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 _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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- e_intl.c 31 Oct 2007 19:48:00 -0000 1.96
+++ e_intl.c 9 Feb 2008 22:41:30 -0000 1.97
@@ -47,7 +47,7 @@
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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_manager.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_manager.c 29 Sep 2007 09:06:12 -0000 1.66
+++ e_manager.c 9 Feb 2008 22:41:30 -0000 1.67
@@ -14,7 +14,7 @@
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 @@
}
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- e_menu.c 11 Jan 2008 07:33:55 -0000 1.75
+++ e_menu.c 9 Feb 2008 22:41:30 -0000 1.76
@@ -86,7 +86,7 @@
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 @@
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_path.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_path.c 1 Oct 2007 20:12:55 -0000 1.24
+++ e_path.c 9 Feb 2008 22:41:30 -0000 1.25
@@ -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 @@
}
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_theme.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_theme.c 1 Nov 2007 20:02:26 -0000 1.33
+++ e_theme.c 9 Feb 2008 22:41:30 -0000 1.34
@@ -13,8 +13,8 @@
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 @@
/* 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 @@
}
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;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
