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 /src/lib/efreet | |
parent | aa8565b372c0a2a6a828b624d32a5b69e70bdd7c (diff) |
efreet menu cbs don't return a value and take const data params
Diffstat (limited to 'src/lib/efreet')
-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) | |||
522 | } | 522 | } |
523 | 523 | ||
524 | EAPI void | 524 | EAPI void |
525 | efreet_menu_async_get(Efreet_Menu_Cb func, void *data) | 525 | efreet_menu_async_get(Efreet_Menu_Cb func, const void *data) |
526 | { | 526 | { |
527 | efreet_menu_internal_get(func, data); | 527 | efreet_menu_internal_get(func, (void*)data); |
528 | } | 528 | } |
529 | 529 | ||
530 | EAPI Efreet_Menu * | 530 | EAPI Efreet_Menu * |
@@ -534,13 +534,13 @@ efreet_menu_get(void) | |||
534 | } | 534 | } |
535 | 535 | ||
536 | EAPI void | 536 | EAPI void |
537 | efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, void *data) | 537 | efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data) |
538 | { | 538 | { |
539 | Efreet_Menu_Async *async; | 539 | Efreet_Menu_Async *async; |
540 | 540 | ||
541 | async = NEW(Efreet_Menu_Async, 1); | 541 | async = NEW(Efreet_Menu_Async, 1); |
542 | async->func = func; | 542 | async->func = func; |
543 | async->data = data; | 543 | async->data = (void*)data; |
544 | async->path = eina_stringshare_add(path); | 544 | async->path = eina_stringshare_add(path); |
545 | ecore_thread_run(_efreet_menu_async_parse_cb, NULL, NULL, async); | 545 | ecore_thread_run(_efreet_menu_async_parse_cb, NULL, NULL, async); |
546 | } | 546 | } |
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 | |||
49 | * | 49 | * |
50 | * @since 1.8 | 50 | * @since 1.8 |
51 | */ | 51 | */ |
52 | typedef void *(*Efreet_Menu_Cb) (void *data, Efreet_Menu *menu); | 52 | typedef void (*Efreet_Menu_Cb) (void *data, Efreet_Menu *menu); |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * @return Returns no value | 55 | * @return Returns no value |
@@ -83,7 +83,7 @@ EAPI void efreet_menu_file_set(const char *file); | |||
83 | * | 83 | * |
84 | * @since 1.8 | 84 | * @since 1.8 |
85 | */ | 85 | */ |
86 | EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, void *data); | 86 | EAPI void efreet_menu_async_get(Efreet_Menu_Cb func, const void *data); |
87 | 87 | ||
88 | /** | 88 | /** |
89 | * @return Returns the Efreet_Menu representation of the default menu or | 89 | * @return Returns the Efreet_Menu representation of the default menu or |
@@ -101,7 +101,7 @@ EAPI Efreet_Menu *efreet_menu_get(void); | |||
101 | * | 101 | * |
102 | * @since 1.8 | 102 | * @since 1.8 |
103 | */ | 103 | */ |
104 | EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, void *data); | 104 | EAPI void efreet_menu_async_parse(const char *path, Efreet_Menu_Cb func, const void *data); |
105 | 105 | ||
106 | /** | 106 | /** |
107 | * @param path The path of the menu to load | 107 | * @param path The path of the menu to load |