Removed build dependency on ecore_x 88/2788/1
authorJimmy Huang <jimmy.huang@intel.com>
Wed, 27 Feb 2013 18:49:02 +0000 (10:49 -0800)
committerJimmy Huang <jimmy.huang@intel.com>
Wed, 27 Feb 2013 18:49:02 +0000 (10:49 -0800)
Added #ifdefs to stub out all calls to ecore_x and removed build depenency on ecore-x

Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>
CMakeLists.txt
src/menu_screen.c

index 51093f0..9e8003b 100644 (file)
@@ -24,7 +24,6 @@ pkg_check_modules(MENU_PKGS REQUIRED
        ecore-file
        ecore-imf
        ecore-input
-       ecore-x
        edje
        eet
        eina
index 2893ee1..83546d3 100644 (file)
@@ -19,7 +19,9 @@
 #define HAVE_X 0
 
 #include <Elementary.h>
+#if HAVE_X
 #include <Ecore_X.h>
+#endif
 #include <ail.h>
 #include <app.h>
 #include <stdbool.h>
@@ -120,7 +122,9 @@ void menu_screen_set_done(bool is_done)
 
 static menu_screen_error_e _create_canvas(char *name, char *title)
 {
+#if HAVE_X
        Ecore_X_Atom ATOM_WM_WINDOW_ROLE;
+#endif
 
        menu_screen_info.win = elm_win_add(NULL, name, ELM_WIN_BASIC);
        retv_if(NULL == menu_screen_info.win, MENU_SCREEN_ERROR_FAIL);
@@ -130,7 +134,7 @@ static menu_screen_error_e _create_canvas(char *name, char *title)
        }
        elm_win_borderless_set(menu_screen_info.win, EINA_TRUE);
 
-#if 0
+#if HAVE_X
        /* X Specific */
        ecore_x_icccm_name_class_set(elm_win_xwindow_get(menu_screen_info.win), "MENU_SCREEN", "MENU_SCREEN");
        ATOM_WM_WINDOW_ROLE = ecore_x_atom_get("WM_WINDOW_ROLE");
@@ -297,7 +301,7 @@ static bool _create_cb(void *data)
 {
        Evas_Object *layout;
 
-#if 0
+#if HAVE_X
        /* Move this call to be executed after window is created */
        _set_scale();
 #endif