remove useless feature x

Change-Id: I63ec96ddde4ec855be36ed514a37ffb95ce618bc
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 0112867..14b7b5f
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,10 +42,7 @@ ENDIF()
 
 
 # DPMS
-IF("${DPMS}" STREQUAL "x")
-SET(COMMON_SRCS ${COMMON_SRCS}
-               ${COMMON_DIR}/popup-ui-dpms-x.c)
-ELSEIF("${DPMS}" STREQUAL "wayland")
+IF("${DPMS}" STREQUAL "wayland")
 SET(COMMON_SRCS ${COMMON_SRCS}
                ${COMMON_DIR}/popup-ui-dpms-wayland.c)
 ELSE()

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index 67ac42a..cfc18b0 100755 (executable)
--- a/packaging/system-servant.spec
+++ b/packaging/system-servant.spec
@@ -1,4 +1,3 @@
-%bcond_with x
 %bcond_with wayland
 %bcond_with emulator
 
@@ -108,10 +107,6 @@ BuildRequires:  model-build-features
        %define FORMFACTOR rectangle
 %endif
 
-%if %{with x}
-BuildRequires:  pkgconfig(ecore-x)
-BuildRequires:  pkgconfig(utilX)
-%endif
 BuildRequires:  cmake
 BuildRequires:  gettext-devel
 
@@ -208,9 +203,6 @@ cp %{SOURCE2003} .
 %endif
 
 %define DPMS none
-%if %{with x}
-%define DPMS x
-%endif
 %if %{with wayland}
 %define DPMS wayland
 %endif

diff --git a/src/common/popup-ui-dpms-x.c b/src/common/popup-ui-dpms-x.c
deleted file mode 100755 (executable)
index db578c1..0000000
--- a/src/common/popup-ui-dpms-x.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *  system-popup
- *
- * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <Ecore_X.h>
-#include <utilX.h>
-#include "popup-ui.h"
-
-void resize_window(void)
-{
-       int w, h, len;
-       Evas_Object *win;
-
-       win = get_window();
-       if (win) {
-               ecore_x_window_size_get(
-                               ecore_x_window_root_first_get(), &w, &h);
-               len = max(w,h);
-               evas_object_resize(win, len, len);
-       }
-}
-
-int window_priority(int priority)
-{
-       Ecore_X_Window xwin;
-       Display *dpy;
-       Evas_Object *win;
-
-       win = get_window();
-       if (!win)
-               return -ENOMEM;
-
-       switch (priority) {
-       case WIN_PRIORITY_LOW:
-               priority = UTILX_NOTIFICATION_LEVEL_LOW;
-               break;
-       case WIN_PRIORITY_NORMAL:
-               priority = UTILX_NOTIFICATION_LEVEL_NORMAL;
-               break;
-       case WIN_PRIORITY_HIGH:
-               priority = UTILX_NOTIFICATION_LEVEL_HIGH;
-               break;
-       default:
-               return -EINVAL;
-       }
-       if (priority < WIN_PRIORITY_LOW || priority > WIN_PRIORITY_HIGH)
-               return -EINVAL;
-
-       xwin = elm_win_xwindow_get(win);
-       dpy = ecore_x_display_get();
-
-       ecore_x_netwm_window_type_set(xwin, ECORE_X_WINDOW_TYPE_NOTIFICATION);
-       utilx_set_system_notification_level(dpy, xwin, priority);
-
-       return 0;
-}

diff --git a/src/crash/CMakeLists.txt b/src/crash/CMakeLists.txt
index 6c596d8..7b1b05d 100755 (executable)
--- a/src/crash/CMakeLists.txt
+++ b/src/crash/CMakeLists.txt
@@ -35,13 +35,6 @@ SET(PKG_MODULES
                pkgmgr-info
 )
 
-IF("${DPMS}" STREQUAL "x")
-SET(PKG_MODULES ${PKG_MODULES}
-               ecore-x
-               utilX
-)
-ENDIF("${DPMS}" STREQUAL "x")
-
 INCLUDE(FindPkgConfig)
 pkg_check_modules(crash_pkgs REQUIRED ${PKG_MODULES})