Make libug-wordclock-efl not dependent on ecore-x.

Change-Id: Ide8f79143af5da9a77a096665a632497045b55ce
Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/clock-common/CMakeLists.txt b/clock-common/CMakeLists.txt
index 3b588b2..c666353 100644 (file)
--- a/clock-common/CMakeLists.txt
+++ b/clock-common/CMakeLists.txt
@@ -13,10 +13,10 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(clk_com_pkgs REQUIRED
                        elementary appcore-efl
                        gobject-2.0 gmodule-2.0 dlog
-                       utilX vconf
+                       vconf
                        icu-i18n
                        alarm-engine
-                       edbus ecore-imf ecore-x ecore ecore-file ecore-input
+                       edbus ecore-imf ecore ecore-file ecore-input
 )
 
 # CFlags

diff --git a/clock-common/src/clock_fwk_util.c b/clock-common/src/clock_fwk_util.c
index 2bb7954..d8865da 100644 (file)
--- a/clock-common/src/clock_fwk_util.c
+++ b/clock-common/src/clock_fwk_util.c
@@ -15,7 +15,6 @@
  */
 
 #include "clock_fwk_util.h"
-#include <Ecore_X.h>
 #include <alarm-engine.h>
 #include <vconf.h>
 #include <stdlib.h>
@@ -87,16 +86,12 @@ void main_quit_cb(void *data, Evas_Object *obj, const char *emission,
 Evas_Object *create_win(const char *name)
 {
        Evas_Object *eo = NULL;
-       int width, height;
        eo = elm_win_add(NULL, name, ELM_WIN_BASIC);
        if (eo) {
                elm_win_title_set(eo, name);
                elm_win_borderless_set(eo, EINA_TRUE);
                evas_object_smart_callback_add(eo, "delete,request", win_del,
                                               NULL);
-               ecore_x_window_size_get(ecore_x_window_root_first_get(), &width,
-                                       &height);
-               evas_object_resize(eo, width, height);
        }
        return eo;
 }

diff --git a/include/worldclock.h b/include/worldclock.h
index 4670ae2..d8a389f 100644 (file)
--- a/include/worldclock.h
+++ b/include/worldclock.h
@@ -18,7 +18,6 @@
 #define __DEF_WORLDCLOCK_H__
 
 #include <Elementary.h>
-#include <utilX.h>
 #include <Ecore_IMF.h>
 #include <ui-gadget.h>
 

diff --git a/include/worldclock_data.h b/include/worldclock_data.h
index f4d81c4..6e7eb1c 100644 (file)
--- a/include/worldclock_data.h
+++ b/include/worldclock_data.h
@@ -18,7 +18,6 @@
 #define __DEF_WORLDCLOCK_DATA_H_
 
 #include <Elementary.h>
-#include <utilX.h>
 
 #include "worldclock_types.h"
 

diff --git a/packaging/libug-worldclock-efl.spec b/packaging/libug-worldclock-efl.spec
index 5e7b2a9..f635467 100644 (file)
--- a/packaging/libug-worldclock-efl.spec
+++ b/packaging/libug-worldclock-efl.spec
@@ -12,7 +12,6 @@ Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/sqlite3
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(db-util)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 737a95d..0cf72b9 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ SET(SRCS
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED appcore-efl utilX elementary db-util
+pkg_check_modules(pkgs REQUIRED appcore-efl elementary db-util
                                                glib-2.0 dlog vconf
                                                ui-gadget-1 bundle
                         icu-i18n heynoti

diff --git a/src/worldclock_add_view.c b/src/worldclock_add_view.c
index 9580342..2694b5d 100644 (file)
--- a/src/worldclock_add_view.c
+++ b/src/worldclock_add_view.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <appcore-efl.h>
 #include <Elementary.h>
-#include <Ecore_X.h>
 #include <vconf.h>
 #include <unicode/utf8.h>
 #include <unicode/ustring.h>

diff --git a/src/worldclock_data.c b/src/worldclock_data.c
index 8c1f751..e0d5492 100644 (file)
--- a/src/worldclock_data.c
+++ b/src/worldclock_data.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <appcore-efl.h>
 #include <Elementary.h>
-#include <Ecore_X.h>
 #include <db-util.h>
 #include <fcntl.h>
 

diff --git a/src/worldclock_util.c b/src/worldclock_util.c
index d7fc6eb..1823b80 100644 (file)
--- a/src/worldclock_util.c
+++ b/src/worldclock_util.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <appcore-efl.h>
 #include <Elementary.h>
-#include <Ecore_X.h>
 #include <vconf.h>
 #include <heynoti.h>
 #include <unicode/ustring.h>