do not use elm_win_profiles set at tizen 3.0 50/41250/2 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common accepted/tizen/3.0.2015.q2/common/20150615.091806 accepted/tizen/common/20150612.071807 accepted/tizen/mobile/20150612.073404 accepted/tizen/tv/20150612.073417 accepted/tizen/wearable/20150612.073429 submit/tizen/20150612.041230 submit/tizen_3.0.2015.q2_common/20150615.075539
authorSooChan Lim <sc1.lim@samsung.com>
Fri, 12 Jun 2015 02:19:35 +0000 (11:19 +0900)
committerSung-Jin Park <sj76.park@samsung.com>
Fri, 12 Jun 2015 04:10:13 +0000 (21:10 -0700)
Change-Id: I600b302bb54ada04d478eca83bf47d1eaf865e15

configure.ac
packaging/libeom.spec
src/eom.c

index 7722d37..672c16c 100755 (executable)
@@ -57,6 +57,13 @@ AC_ARG_WITH(eom-platform, AS_HELP_STRING([--with-eom-platform=WINSYS], [eom plat
 AC_SUBST(EOM_PLATFORM)
 
 
+AC_ARG_WITH(tizen-version, AS_HELP_STRING([--with-tizen-version=T_VERSION], [eom platform (default: TIZEN_2_X)]),
+                               [ TIZEN_VERSION="$withval" ],
+                               [ TIZEN_VERSION="TIZEN_2_X" ])
+AC_SUBST(TIZEN_VERSION)
+
+
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(DBUS, dbus-1)
 PKG_CHECK_MODULES(GLIB, glib-2.0 gobject-2.0)
@@ -109,6 +116,14 @@ fi
 AM_CONDITIONAL(HAVE_EOM_PLATFORM_X11, test "x$EOM_PLATFORM" = "xX11")
 AM_CONDITIONAL(HAVE_EOM_PLATFORM_WAYLAND, test "x$EOM_PLATFORM" = "xWAYLAND")
 
+if test "x$TIZEN_VERSION" = "xTIZEN_2_X"; then
+       AC_DEFINE(HAVE_TIZEN_2_X,1,[tizen version is 2.x.])
+fi
+
+AM_CONDITIONAL(HAVE_TIZEN_VERSION_2_X, test "x$TIZEN_VERSION" = "xTIZEN_2_X")
+
+
+
 # Checks for header files.
 AC_HEADER_STDC
 
index 51a5f91..4a1d22c 100644 (file)
@@ -43,7 +43,11 @@ export LDFLAGS="$LDFLAGS -Wl,--hash-style=both -Wl,--as-needed"
 %if %{with wayland}
 %reconfigure --disable-dlog --disable-static --with-eom-platform=WAYLAND
 %else
-%reconfigure --disable-dlog --disable-static --with-eom-platform=X11
+%if 0%{?tizen_version_major} == 2
+%reconfigure --disable-dlog --disable-static --with-eom-platform=X11 --with-tizen-version=TIZEN_2_X
+%else
+%reconfigure --disable-dlog --disable-static --with-eom-platform=X11 --with-tizen-version=TIZEN_3_X
+%endif
 %endif
 
 make %{?_smp_mflags}
index 6f08a4e..0591940 100644 (file)
--- a/src/eom.c
+++ b/src/eom.c
@@ -1199,8 +1199,10 @@ eom_set_output_window(eom_output_id output_id, Evas_Object *win)
        g_value_array_free(ret_array);
 
        if (ret == 1) {
+#ifdef HAVE_TIZEN_2_X
                const char *profile = "desktop";
                elm_win_profiles_set(win, &profile, 1);
+#endif
                elm_win_fullscreen_set(win, EINA_TRUE);
                INFO("SetWindow: success\n");
                _eom_mutex_unlock();