diff options
| author | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-06-21 09:50:03 +0100 |
|---|---|---|
| committer | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-06-21 09:50:03 +0100 |
| commit | 51246fff6828e1d179c43b32895bb830b537f7d8 (patch) | |
| tree | e2df36db32ba3c169eb1ccf02ab88d8d70aebf16 | |
| parent | aa8565b372c0a2a6a828b624d32a5b69e70bdd7c (diff) | |
| download | efl-51246fff6828e1d179c43b32895bb830b537f7d8.tar.gz | |
efreet menu cbs don't return a value and take const data params
| -rw-r--r-- | src/lib/efreet/efreet_menu.c | 8 | ||||
| -rw-r--r-- | src/lib/efreet/efreet_menu.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/efreet/efreet_menu.c b/src/lib/efreet/efreet_menu.c index 713cfe981e..9959f0366a 100644 --- a/src/lib/efreet/efreet_menu.c +++ b/src/lib/efreet/efreet_menu.c @@ -522,9 +522,9 @@ efreet_menu_file_set(const char *file) } EAPI void -efreet_menu_async_get(Efreet_Menu_Cb func, void *data) +efreet_menu_async_get(Efreet_Menu_Cb func, const void *data) { - efreet_menu_internal_get(func, data); + efreet_menu_internal_get(func, (void*)data); } EAPI Efreet_Menu * @@ -534,13 +534,13 @@ efreet_menu_get(void) } EAPI void -efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, void *data) +efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data) { Efreet_Menu_Async *async; async = NEW(Efreet_Menu_Async, 1); async->func = func; - async->data = data; + async->data = (void*)data; async->path = eina_stringshare_add(path); ecore_thread_run(_efreet_menu_async_parse_cb, NULL, NULL, async); } diff --git a/src/lib/efreet/efreet_menu.h b/src/lib/efreet/efreet_menu.h index fa58692cd2..c525afd884 100644 --- a/src/lib/efreet/efreet_menu.h +++ b/src/lib/efreet/efreet_menu.h @@ -49,7 +49,7 @@ struct Efreet_Menu * * @since 1.8 */ -typedef void *(*Efreet_Menu_Cb) (void *data, Efreet_Menu *menu); +typedef void (*Efreet_Menu_Cb) (void *data, Efreet_Menu *menu); /** * @return Returns no value @@ -83,7 +83,7 @@ EAPI void efreet_menu_file_set(const char *file); * * @since 1.8 */ -EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, void *data); +EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, const void *data); /** * @return Returns the Efreet_Menu representation of the default menu or @@ -101,7 +101,7 @@ EAPI Efreet_Menu *efreet_menu_get(void); * * @since 1.8 */ -EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, void *data); +EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data); /** * @param path The path of the menu to load |