[EGIT] [core/efl] master 01/01: efreet menu cbs don't return a value and take const data params

[Mike Blumenkrantz - Enlightenment Git]

discomfitor pushed a commit to branch master.

commit 51246fff6828e1d179c43b32895bb830b537f7d8
Author: Mike Blumenkrantz <m.blumenk...@samsung.com>
Date:   Fri Jun 21 09:50:03 2013 +0100

    efreet menu cbs don't return a value and take const data params
---
 src/lib/efreet/efreet_menu.c | 8 ++++----
 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 713cfe9..9959f03 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 fa58692..c525afd 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

-- 

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev