summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoram Park <boram1288.park@samsung.com>2015-01-26 09:56:23 (GMT)
committerBoram Park <boram1288.park@samsung.com>2015-01-26 13:37:14 (GMT)
commitab0617e134e4a5bc233529b9c32fbd2467de1cd0 (patch)
tree906c18faf492d44cdb08e8854ce15d4a17c38dac
parent3fea46988e40da5a5fa844d5efacc43152604f42 (diff)
downloadui-gadget-1-tizen_3.0.2015.q1_common.zip
ui-gadget-1-tizen_3.0.2015.q1_common.tar.gz
ui-gadget-1-tizen_3.0.2015.q1_common.tar.bz2
Change-Id: Ic04690c07186e7ec28537ecf9df9ac3c48aa01b1 Signed-off-by: Boram Park <boram1288.park@samsung.com>
-rw-r--r--CMakeLists.txt2
-rw-r--r--include/ug-manager.h4
-rw-r--r--packaging/ui-gadget-1.spec1
-rw-r--r--src/manager.c46
4 files changed, 2 insertions, 51 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed72a99..f0f69f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
SET(PKGS_CHECK_MODULES "glib-2.0 bundle dlog capi-appfw-application appsvc capi-appfw-app-manager ecore elementary libtzplatform-config")
IF (with_x)
- PKG_CHECK_MODULES(PKGS REQUIRED ${PKGS_CHECK_MODULES} utilX x11)
+ PKG_CHECK_MODULES(PKGS REQUIRED ${PKGS_CHECK_MODULES} x11)
ENDIF(with_x)
IF (with_wayland)
diff --git a/include/ug-manager.h b/include/ug-manager.h
index 7c7e059..87de678 100644
--- a/include/ug-manager.h
+++ b/include/ug-manager.h
@@ -22,10 +22,6 @@
#ifndef __UG_MANAGER_H__
#define __UG_MANAGER_H__
-#ifndef WAYLAND
-#include <utilX.h>
-#endif
-
#include <Evas.h>
#include "ug.h"
diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec
index e8e5113..6496b75 100644
--- a/packaging/ui-gadget-1.spec
+++ b/packaging/ui-gadget-1.spec
@@ -16,7 +16,6 @@ BuildRequires: pkgconfig(appcore-efl)
BuildRequires: pkgconfig(bundle)
BuildRequires: pkgconfig(dlog)
%if %{with x}
-BuildRequires: pkgconfig(utilX)
BuildRequires: pkgconfig(x11)
%endif
BuildRequires: pkgconfig(appsvc)
diff --git a/src/manager.c b/src/manager.c
index 5c9cbed..093b465 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -26,7 +26,6 @@
#include <glib.h>
#ifndef WAYLAND
-#include <utilX.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#include <Ecore_X.h>
@@ -406,50 +405,7 @@ static int ugman_indicator_overlap_update(enum ug_option opt)
static int ugman_indicator_update(enum ug_option opt, enum ug_event event)
{
- int enable;
- int cur_state;
-
-#ifndef WAYLAND
- cur_state = utilx_get_indicator_state(ug_man.disp, ug_man.win_id);
-#else
- cur_state = -1; //state is -1 (unknown)
-#endif
-
- _DBG("indicator update opt(%d) cur_state(%d)", opt, cur_state);
-
-#ifndef ENABLE_UG_HANDLE_INDICATOR_HIDE
- enable = 1;
-#else
- switch (GET_OPT_INDICATOR_VAL(opt)) {
- case UG_OPT_INDICATOR_ENABLE:
- if (event == UG_EVENT_NONE)
- enable = 1;
- else
- enable = cur_state ? 1 : 0;
- break;
- case UG_OPT_INDICATOR_PORTRAIT_ONLY:
- enable = ug_man.is_landscape ? 0 : 1;
- break;
- case UG_OPT_INDICATOR_LANDSCAPE_ONLY:
- enable = ug_man.is_landscape ? 1 : 0;
- break;
- case UG_OPT_INDICATOR_DISABLE:
- enable = 0;
- break;
- case UG_OPT_INDICATOR_MANUAL:
- return 0;
- default:
- _ERR("update failed: Invalid opt(%d)", opt);
- return -1;
- }
-#endif
-
- if(cur_state != enable) {
- _DBG("set indicator as %d", enable);
-#ifndef WAYLAND
- utilx_enable_indicator(ug_man.disp, ug_man.win_id, enable);
-#endif
- }
+ _ERR("controlling indicator is disabled");
return 0;
}