From 3b58ee482ea44bc39422d7036f9181138ab42338 Mon Sep 17 00:00:00 2001 From: Hao Li Date: Wed, 30 Jan 2013 11:32:59 +0800 Subject: [PATCH] Run appcore_efl_main rather than elm_run directly to ensure it will call aul initialization to create socket on /tmp/alaunch to fix TIVI-421 --- dialer/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- packaging/lemolo.changes | 3 +++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dialer/main.c b/dialer/main.c index c5403f6..f3a4713 100644 --- a/dialer/main.c +++ b/dialer/main.c @@ -2,6 +2,11 @@ #include "config.h" #endif #include +#include +#include +#include +#include + #ifndef ELM_LIB_QUICKLAUNCH #include "log.h" @@ -59,6 +64,31 @@ static const Ecore_Getopt options = { int _log_domain = -1; int _app_exit_code = EXIT_SUCCESS; +static int _create(void *data __UNUSED__) +{ + return 0; +} + +static int _reset(bundle *b __UNUSED__, void *data __UNUSED__) +{ + return 0; +} + +static int _resume(void *data __UNUSED__) +{ + return 0; +} + +static int _pause(void *data __UNUSED__) +{ + return 0; +} + +static int _terminate(void *data __UNUSED__) +{ + return 0; +} + EAPI int elm_main(int argc, char **argv) { int args; @@ -180,7 +210,17 @@ EAPI int elm_main(int argc, char **argv) } INF("Entering main loop"); - elm_run(); + + struct appcore_ops ops = { + .create = _create, + .resume = _resume, + .reset = _reset, + .pause = _pause, + .terminate = _terminate, + }; + ops.data = NULL; + //elm_run(); + int iReturn = appcore_efl_main("org.tizen.dialer", &argc, &argv, &ops); INF("Quit main loop"); gui_shutdown(); @@ -194,7 +234,8 @@ end_rc: end: elm_shutdown(); - return _app_exit_code; + return iReturn; + //return _app_exit_code; } #endif diff --git a/packaging/lemolo.changes b/packaging/lemolo.changes index 464d410..c0706e8 100644 --- a/packaging/lemolo.changes +++ b/packaging/lemolo.changes @@ -1,3 +1,6 @@ +* Wed Jan 30 2013 Hao Li +- Run appcore_efl_main rather than elm_run directly to ensure it will call aul initialization to create socket on /tmp/alaunch to fix TIVI-421 + * Fri Dec 14 2012 Jimmy Huang - Fixed bug TIVI-391 -- 2.7.4