Run appcore_efl_main rather than elm_run directly to ensure it will call aul initiali... 08/2708/1 2.0alpha 20alpha-wayland rollback accepted/2.0alpha-wayland/20130522.161733 accepted/2.0alpha/20130205.173131 accepted/2.0alpha/20130215.200741 submit/2.0-panda/20130222.210132 submit/2.0/20130306.222908 submit/2.0alpha-wayland/20130522.164847 submit/2.0alpha/20130130.044857 submit/2.0alpha/20130205.065905 submit/rollback/20130522.164736
authorHao Li <hao.h.li@intel.com>
Wed, 30 Jan 2013 03:32:59 +0000 (11:32 +0800)
committerHao Li <hao.h.li@intel.com>
Wed, 30 Jan 2013 03:32:59 +0000 (11:32 +0800)
dialer/main.c
packaging/lemolo.changes

index c5403f6..f3a4713 100644 (file)
@@ -2,6 +2,11 @@
 #include "config.h"
 #endif
 #include <Elementary.h>
+#include <appcore-efl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <Evas.h>
+
 #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
index 464d410..c0706e8 100644 (file)
@@ -1,3 +1,6 @@
+* Wed Jan 30 2013 Hao Li <hao.h.li@intel.com>
+- 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 <jimmy.huang@linux.intel.com>
 - Fixed bug TIVI-391