Remove wayland dependancy 35/168735/2
authorhyunho <hhstark.kang@samsung.com>
Tue, 30 Jan 2018 10:44:57 +0000 (19:44 +0900)
committerhyunho <hhstark.kang@samsung.com>
Tue, 30 Jan 2018 10:55:05 +0000 (19:55 +0900)
Change-Id: Iaac3c9737269ad6ab5a68680b66267b4e8676bcc
Signed-off-by: hyunho <hhstark.kang@samsung.com>
CMakeLists.txt
packaging/libwidget_service.spec
src/widget_service.c

index b8d2c86..5717481 100644 (file)
@@ -30,7 +30,6 @@ pkg_check_modules(pkgs REQUIRED
        libtzplatform-config
        uuid
        cynara-client
-       ecore-wayland
        iniparser
        libsmack
 )
index 88967c3..cd6fae4 100644 (file)
@@ -26,7 +26,6 @@ BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(cynara-client)
 BuildRequires: pkgconfig(pkgmgr-installer)
-BuildRequires: pkgconfig(ecore-wayland)
 BuildRequires: pkgconfig(iniparser)
 BuildRequires: pkgconfig(libsmack)
 
index 6c7c5ee..6a780b2 100644 (file)
@@ -29,7 +29,6 @@
 #include <vconf.h>
 #include <vconf-keys.h>
 #include <unicode/uloc.h>
-#include <Ecore_Wayland.h>
 #include <aul.h>
 #include <tzplatform_config.h>
 #include <pkgmgr-info.h>
@@ -41,6 +40,7 @@
 #include <pwd.h>
 
 #include <aul_widget.h>
+#include <system_info.h>
 
 #include "widget_errno.h"
 #include "debug.h"
@@ -499,6 +499,7 @@ static char *_resolution_file_path(void)
        char *path;
        int length;
        int w, h;
+       int ret;
 
        length = strlen(RESOLUTION_PATH_FORMAT) + 12;
        path = calloc(1, length);
@@ -507,7 +508,21 @@ static char *_resolution_file_path(void)
                return NULL;
        }
 
-       ecore_wl_screen_size_get(&w, &h);
+       ret = system_info_get_platform_int(
+               "http://tizen.org/feature/screen.width", &w);
+       if (ret != SYSTEM_INFO_ERROR_NONE) {
+               _E("fail to get width: %d", ret);
+               free(path);
+               return NULL;
+       }
+
+       ret = system_info_get_platform_int(
+               "http://tizen.org/feature/screen.height", &h);
+       if (ret != SYSTEM_INFO_ERROR_NONE) {
+               _E("fail to get height: %d", ret);
+               free(path);
+               return NULL;
+       }
        _D("screen size : %d %d", w, h);
 
        snprintf(path, length, RESOLUTION_PATH_FORMAT, w, h);