Bug fix: Change the way of getting argument.submit/2.0alpha-wayland/20130612.051654accepted/2.0alpha-wayland/20130612.1748222.0alpha-wayland

Change-Id: I2bd242061e1b757977f606bc846b3502efa43a84
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>

3 files changed, 13 insertions, 8 deletions

diff --git a/ico-app-samplenavi/org.tizen.ico.app-samplenavi.desktop b/ico-app-samplenavi/org.tizen.ico.app-samplenavi.desktop
index 2722faf..408a784 100644
--- a/ico-app-samplenavi/org.tizen.ico.app-samplenavi.desktop
+++ b/ico-app-samplenavi/org.tizen.ico.app-samplenavi.desktop
@@ -1,6 +1,6 @@
 Name=ico-app-samplenavi
 Type=Application
-Exec=/opt/apps/org.tizen.ico.app-samplenavi/bin/ico-app-samplenavi -basescreen
+Exec=/opt/apps/org.tizen.ico.app-samplenavi/bin/ico-app-samplenavi rightoption -basescreen
 Icon=org.tizen.ico.app-samplenavi.png
 NoDisplay=false
 Version=0.1.0
diff --git a/ico-app-samplenavi/src/Makefile.am b/ico-app-samplenavi/src/Makefile.am
index 31a0fa2..38d5991 100644
--- a/ico-app-samplenavi/src/Makefile.am
+++ b/ico-app-samplenavi/src/Makefile.am
@@ -3,7 +3,7 @@ app_samplenavi_bindir = /opt/apps/org.tizen.ico.app-samplenavi/bin
 app_samplenavi_bin_PROGRAMS = ico-app-samplenavi
  
 ico_app_samplenavi_SOURCES = samplenavi.c samplenavi.h e3d.c e3d.h define.h
-ico_app_samplenavi_LDADD = -L/usr/lib -lico-app-fw-efl -lico-uxf-weston-plugin -lico-app-fw -ldbus-1 -lpthread -lrt -lwebsockets -laul -lecore_evas -lecore -leina -levas -lecore_wayland -lelementary -lm -leet -lecore_file -ledje -lethumb_client -lecore_imf -lecore_con -lglib-2.0 -lwayland-client -lwayland-cursor -lwayland-egl -lwayland-server -lewebkit2 -lcairo -lGLESv2 -lEGL -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgdk_pixbuf-2.0 -lgthread-2.0
+ico_app_samplenavi_LDADD = -L/usr/lib -lico-app-fw-efl -lico-uxf-weston-plugin -lico-app-fw -ldbus-1 -lpthread -lrt -lwebsockets -laul -lecore_evas -lecore -leina -levas -lecore_wayland -lelementary -lm -leet -lecore_file -ledje -lethumb_client -lecore_imf -lecore_con -lglib-2.0 -lwayland-client -lwayland-cursor -lwayland-egl -lwayland-server -lewebkit2 -lcairo -lGLESv2 -lEGL -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgdk_pixbuf-2.0 -lgthread-2.0 -lbundle
 
 ico_app_samplenavi_CFLAGS = -Wall -I. -I/usr/include/ico-appfw -I/usr/include/ecore-1 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/eina-1 -I/usr/include/eina-1/eina -I/usr/include/evas-1 -I/usr/include/eet-1 -I/usr/include/pixman-1 -I/usr/include/harfbuzz -I/usr/include/fribidi -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/elementary-1 -I/usr/include/ethumb-1 -I/usr/include/efreet-1 -I/usr/include/e_dbus-1 -I/usr/include/emotion-1 -I/usr/include/edje-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/embryo-1 -I/usr/include/ewebkit2-0 -I/usr/include/ewebkit2-0/WebKit2 -I/usr/include/ewebkit2-0/NPAPI -I/usr/include/cairo -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0
 
diff --git a/ico-app-samplenavi/src/samplenavi.c b/ico-app-samplenavi/src/samplenavi.c
index dc7572b..b49c008 100644
--- a/ico-app-samplenavi/src/samplenavi.c
+++ b/ico-app-samplenavi/src/samplenavi.c
@@ -18,6 +18,7 @@
 #include <time.h>
 #include <stddef.h>
 #include <getopt.h>
+#include <bundle.h>
 #include <dbus/dbus.h>
 #include <libwebsockets.h>
 #include <EWebKit2.h>
@@ -1727,11 +1728,12 @@ res_callback(ico_apf_resource_notify_info_t *info, void *user_data)
 /*--------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
-    int i;
     int getscreen;
     char appid[ICO_UXF_MAX_PROCESS_NAME + 1];
     int ret = 0;
     connected = 0;
+    bundle *b;
+    const char *val;
 
     /* Setting the log output */
     if (ico_apf_get_app_id(0, appid) == ICO_APP_CTL_E_NONE) {
@@ -1751,20 +1753,23 @@ int main(int argc, char *argv[])
         return -1;
     }
 
+    /* get argment */
+    b = bundle_import_from_argv(argc, argv);
     getscreen = 0;
     sscrntype[0] = 0;
-    for (i = 1; i < argc; i++) {
-        if (argv[i][0] == '-') {
-            if (strcasecmp(argv[i], "-basescreen") == 0) {
+	if(b != NULL){
+        val = bundle_get_val(b, "rightoption");
+		if (val != NULL) {
+            if (strcasecmp(val, "-basescreen") == 0) {
                 getscreen = 1;  /* get base screen */
                 strcpy(sscrntype, "BasicScreen");
                 uim_debug("BasicScreen");
             }
-            else if (strcasecmp(argv[i], "-intscreen") == 0) {
+            else if (strcasecmp(val, "-intscreen") == 0) {
                 getscreen = 2;  /* get interrupt screen */
                 strcpy(sscrntype, "IntScreen");
             }
-            else if (strcasecmp(argv[i], "-onscreen") == 0) {
+            else if (strcasecmp(val, "-onscreen") == 0) {
                 getscreen = 3;  /* get on screen */
                 strcpy(sscrntype, "OnScreen");
             }