Revert "Use ELM_MAIN macro for main function"

This reverts commit 7308351ee6a153985f1903cfbcdc0d37463427b1.
To use elm_shutdown which is in ELM_MACRO makes crash in some cases.
It'll be restored after the issue resolved.

Change-Id: Icf170a000065a99ae23634355647974a895b53ff
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/src/framework/ui/popup/main.cpp b/src/framework/ui/popup/main.cpp
index a3f257f..435a954 100644 (file)
--- a/src/framework/ui/popup/main.cpp
+++ b/src/framework/ui/popup/main.cpp
@@ -49,15 +49,35 @@ void updateLanguage(void)
        setlocale(LC_ALL, "");
 }
 
+struct ElmRaii {
+       ElmRaii(int argc, char **argv)
+       {
+               DEBUG("elm_init()");
+               elm_init(argc, argv);
+       }
+
+       virtual ~ElmRaii()
+       {
+               DEBUG("elm_shutdown()");
+               /* TODO: do shutdown.
+                *   shutdown generates segmentation fault by unknown reason.
+                */
+               //      elm_shutdown();
+       }
+};
+
 } // namespace anonymous
 
-int elm_main(int, char **)
+int main(int argc, char **argv)
 {
        try {
                Csr::Audit::Logger::setTag("CSR_POPUP");
 
                INFO("CSR popup service start!");
 
+               /* init/shutdown elm automatically */
+               ElmRaii elmRaii(argc, argv);
+
                std::signal(SIGTERM, [](int signal) {
                        WARN("Popup is terminated by signal[" << strsignal(signal) << "]");
                        /* cleanup and close up stuff here */
@@ -81,4 +101,3 @@ int elm_main(int, char **)
                return -1;
        }
 }
-ELM_MAIN()