summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2017-10-27 15:43:23 -0700
committerCedric Bail <cedric@osg.samsung.com>2017-10-27 15:43:23 -0700
commit03df8483f69d4acae79eb75d1bf0d36a1bdea8d8 (patch)
tree5d223afaf019c59f967cc211fce23137d646d2d7 /src/lib/elementary
parent3e41da66a837c420931558955461ac0831685793 (diff)
elementary: update efl_quicklaunch_fallback to use the new EFL exit API.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/elm_general.h14
-rw-r--r--src/lib/elementary/elm_main.c4
2 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 9317dbe0dc..bf7762007e 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -158,6 +158,12 @@ extern EAPI double _elm_startup_time;
158 */ 158 */
159EAPI void efl_exit(int exit_code); 159EAPI void efl_exit(int exit_code);
160 160
161/**
162 * Exposed symbol used only by macros and should not be used by apps
163 * @since 1.18 (as beta)
164 */
165EAPI Eina_Value *efl_quicklaunch_fallback(int argc, char **argv);
166
161#endif /* EFL_BETA_API_SUPPORT */ 167#endif /* EFL_BETA_API_SUPPORT */
162 168
163 169
@@ -311,14 +317,6 @@ EAPI void elm_quicklaunch_cleanup(void);
311 */ 317 */
312EAPI int elm_quicklaunch_fallback(int argc, char **argv); 318EAPI int elm_quicklaunch_fallback(int argc, char **argv);
313 319
314#ifdef EFL_BETA_API_SUPPORT
315/**
316 * Exposed symbol used only by macros and should not be used by apps
317 * @since 1.18 (as beta)
318 */
319EAPI int efl_quicklaunch_fallback(int argc, char **argv);
320#endif
321
322/** 320/**
323 * Exposed symbol used only by macros and should not be used by apps 321 * Exposed symbol used only by macros and should not be used by apps
324 */ 322 */
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 20f596a20b..c0d431e0e5 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1285,7 +1285,7 @@ elm_quicklaunch_fallback(int argc,
1285 return ret; 1285 return ret;
1286} 1286}
1287 1287
1288EAPI int 1288EAPI Eina_Value *
1289efl_quicklaunch_fallback(int argc, 1289efl_quicklaunch_fallback(int argc,
1290 char **argv) 1290 char **argv)
1291{ 1291{
@@ -1299,7 +1299,7 @@ efl_quicklaunch_fallback(int argc,
1299 return efl_loop_begin(ecore_main_loop_get()); 1299 return efl_loop_begin(ecore_main_loop_get());
1300 } 1300 }
1301 1301
1302 return 255; 1302 return eina_value_uchar_new(255);
1303} 1303}
1304 1304
1305EAPI char * 1305EAPI char *