power off: remove unnecessary header file

- The contents of poweroff.h are unnecessary except 3 definitions.
  Thus the contents are removed from poweroff popup

Signed-off-by: Taeyoung Kim <ty317.kim@samsung.com>
Change-Id: Ia9ab36168e533d3d59de06d18590b1cfc648faa3

diff --git a/poweroff-popup/CMakeLists.txt b/poweroff-popup/CMakeLists.txt
index 60bd863..cc7c99e 100755 (executable)
--- a/poweroff-popup/CMakeLists.txt
+++ b/poweroff-popup/CMakeLists.txt
@@ -3,6 +3,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(poweroff-popup C)
 
+SET(PACKAGE ${PROJECT_NAME})
+
 SET(SRCS ${CMAKE_SOURCE_DIR}/poweroff-popup/src/poweroff.c
                 ${CMAKE_SOURCE_DIR}/share/src/common.c)
 
@@ -36,6 +38,7 @@ IF("${ARCH}" STREQUAL "arm")
 ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+ADD_DEFINITIONS("-DPACKAGE=\"${PACAKGE}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")

diff --git a/poweroff-popup/src/poweroff.c b/poweroff-popup/src/poweroff.c
index 21e2dae..d32071e 100755 (executable)
--- a/poweroff-popup/src/poweroff.c
+++ b/poweroff-popup/src/poweroff.c
@@ -21,11 +21,15 @@
 #include <stdio.h>
 #include <svi.h>
 #include <sysman.h>
-#include "poweroff.h"
-#include "common.h"
-
+#include <Elementary.h>
+#include <bundle.h>
 #include <Ecore_X.h>
 #include <utilX.h>
+#include "common.h"
+
+#define EDJ_PATH PREFIX"/apps/org.tizen.poweroff-syspopup/res/edje/poweroff"
+#define EDJ_NAME EDJ_PATH"/poweroff.edj"
+#define PREDEF_POWEROFF "poweroff"
 
 int create_and_show_basic_popup_min(struct appdata *ad);
 void poweroff_response_yes_cb(void *data, Evas_Object * obj, void *event_info);

diff --git a/poweroff-popup/src/poweroff.h b/poweroff-popup/src/poweroff.h
deleted file mode 100644 (file)
index 4a23e6b..0000000
--- a/poweroff-popup/src/poweroff.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  system-popup
- *
- * Copyright (c) 2000 - 2013 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.
- *
- */
-
-
-#ifndef __DEF_poweroff_H_
-#define __DEF_poweroff_H_
-
-#include <Elementary.h>
-#include <bundle.h>
-
-#ifndef PREFIX
-#define PREFIX "/usr"
-#endif
-#define PACKAGE "poweroff-popup"
-#define APPNAME "poweroff-popup"
-#define EDJ_PATH PREFIX"/apps/org.tizen.poweroff-syspopup/res/edje/poweroff"
-#define EDJ_NAME EDJ_PATH"/poweroff.edj"
-#define GRP_MAIN "main"
-#define APPLICATION_BG 1
-#define INDICATOR_HEIGHT (38)
-#define NEW_INDI
-#define ACCT_PROF
-#define PREDEF_POWEROFF "poweroff"
-#define PREDEF_ENTERSLEEP "entersleep"
-#define MAIN_W (480)
-#define MAIN_H (800)
-#define BEAT
-
-#define NAME_BUF_LEN   128
-#define TITLE_BUF_LEN  128
-#define CONTENT_BUF_LEN        256
-
-#endif                         /* __DEF_poweroff_H__ */