From: Jimmy Huang Date: Wed, 21 Aug 2013 23:11:51 +0000 (-0700) Subject: Fixed dialer to build without TIZEN components on Ubunbu X-Git-Tag: submit/tizen/20130822.001017~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afc04936b6a2e7783108f29140432b7120fe14f2;p=profile%2Fivi%2Flemolo.git Fixed dialer to build without TIZEN components on Ubunbu Change-Id: I596e31e4b2f5780541cd51a54728bc0791ed2034 Signed-off-by: Jimmy Huang --- diff --git a/dialer/main.c b/dialer/main.c index abd2c5c..b0b4948 100644 --- a/dialer/main.c +++ b/dialer/main.c @@ -1,17 +1,19 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#ifdef HAVE_TIZEN #include +#endif +#include #include #include #include #ifndef ELM_LIB_QUICKLAUNCH +#include "gui.h" #include "log.h" #include "ofono.h" -#include "gui.h" #include "rc.h" #include "util.h" @@ -64,6 +66,7 @@ static const Ecore_Getopt options = { int _log_domain = -1; int _app_exit_code = EXIT_SUCCESS; +#ifdef HAVE_TIZEN static int _create(void *data __UNUSED__) { return 0; @@ -88,11 +91,11 @@ static int _terminate(void *data __UNUSED__) { return 0; } +#endif EAPI int elm_main(int argc, char **argv) { int args; - int iReturn = 0; char *modem_path = NULL; char *modem_api = NULL; char *modem_type = NULL; @@ -212,6 +215,8 @@ EAPI int elm_main(int argc, char **argv) INF("Entering main loop"); +#ifdef HAVE_TIZEN + int iReturn = 0; struct appcore_ops ops = { .create = _create, .resume = _resume, @@ -220,8 +225,10 @@ EAPI int elm_main(int argc, char **argv) .terminate = _terminate, }; ops.data = NULL; - //elm_run(); iReturn = appcore_efl_main("org.tizen.dialer", &argc, &argv, &ops); +#else + elm_run(); +#endif INF("Quit main loop"); gui_shutdown(); @@ -235,8 +242,11 @@ end_rc: end: elm_shutdown(); +#ifdef HAVE_TIZEN return iReturn; - //return _app_exit_code; +#else + return _app_exit_code; +#endif } #endif