Move app_manager_event.h to internal header

app_manager_event.h is not for export. This is for internal purpose.

Change-Id: I5c5faf57b351a370a9b54b063b426959a533c870
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/include/app_manager.h b/include/app_manager.h
index c5b566c..97083fe 100644 (file)
--- a/include/app_manager.h
+++ b/include/app_manager.h
@@ -86,7 +86,7 @@ typedef enum {
  * @brief  App manager event handle.
  * @since_tizen 3.0
  */
-typedef struct _app_manager_event_s *app_manager_event_h;
+typedef struct app_manager_event_s *app_manager_event_h;
 
 /**
  * @brief Called when the application is enabled or disabled.

diff --git a/include/app_manager_event.h b/include/app_manager_event.h
deleted file mode 100644 (file)
index 011fc21..0000000
--- a/include/app_manager_event.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016 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 __TIZEN_APPFW_APP_MANAGER_EVENT_H
-#define __TIZEN_APPFW_APP_MANAGER_EVENT_H
-
-#include <sys/types.h>
-#include <tizen.h>
-
-#include "app_manager.h"
-
-#include <package-manager.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _app_manager_event_info {
-       int req_id;
-       app_manager_event_type_e event_type;
-       app_manager_event_state_e event_state;
-       struct _app_manager_event_info *next;
-} app_manager_event_info;
-
-typedef struct _app_manager_event_s {
-       int req_id;
-       pkgmgr_client *pc;
-       app_manager_event_cb event_cb;
-       void *user_data;
-       app_manager_event_info *head;
-} app_manager_event;
-
-int app_event_handler(uid_t target_uid, int req_id,
-                               const char *pkg_type, const char *pkgid, const char *appid,
-                               const char *key, const char *val, const void *pmsg, void *data);
-
-int convert_status_type(int status_type);
-
-void remove_app_manager_event_info_list(app_manager_event_info *head);
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TIZEN_APPFW_APP_MANAGER_EVENT_H */
-

diff --git a/src/app_manager.c b/src/app_manager.c
index dbcc133..bab2a6f 100644 (file)
--- a/src/app_manager.c
+++ b/src/app_manager.c
@@ -28,7 +28,6 @@
 
 #include "app_manager.h"
 #include "app_manager_internal.h"
-#include "app_manager_event.h"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/src/app_manager_event.c b/src/app_manager_event.c
index a5dc931..0b87da1 100644 (file)
--- a/src/app_manager_event.c
+++ b/src/app_manager_event.c
@@ -15,9 +15,12 @@
  */
 
 #include <stdlib.h>
+#include <sys/types.h>
+
 #include <dlog.h>
+#include <package-manager.h>
 
-#include "app_manager_event.h"
+#include "app_manager_internal.h"
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/src/app_manager_internal.h b/src/app_manager_internal.h
index cbe1c67..5c41a6e 100644 (file)
--- a/src/app_manager_internal.h
+++ b/src/app_manager_internal.h
@@ -17,6 +17,8 @@
 #ifndef __TIZEN_APPFW_APP_MANAGER_INTERNAL_H
 #define __TIZEN_APPFW_APP_MANAGER_INTERNAL_H
 
+#include <package-manager.h>
+
 #include "app_manager.h"
 #include "app_context.h"
 #include "app_manager_extension.h"
@@ -25,19 +27,6 @@
 #define API __attribute__ ((visibility("default")))
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file app_manager_internal.h
- */
-
-/**
- * @addtogroup CAPI_APPLICATION_MANAGER_MODULE
- * @{
- */
-
 int app_manager_error(app_manager_error_e error, const char *function, const char *description);
 
 int app_context_foreach_app_context(app_manager_app_context_cb callback, void *user_data);
@@ -60,13 +49,27 @@ int app_context_get_app_context_by_instance_id(const char *app_id, const char *i
 
 int app_context_get_instance_id(app_context_h app_context, char **instance_id);
 
-/**
- * @}
- */
+typedef struct app_manager_event_info_s {
+       int req_id;
+       app_manager_event_type_e event_type;
+       app_manager_event_state_e event_state;
+       struct app_manager_event_info_s *next;
+} app_manager_event_info;
 
-#ifdef __cplusplus
-}
-#endif
+typedef struct app_manager_event_s {
+       int req_id;
+       pkgmgr_client *pc;
+       app_manager_event_cb event_cb;
+       void *user_data;
+       app_manager_event_info *head;
+} app_manager_event;
 
-#endif /* __TIZEN_APPFW_APP_MANAGER_INTERNAL_H */
+int app_event_handler(uid_t target_uid, int req_id,
+                               const char *pkg_type, const char *pkgid, const char *appid,
+                               const char *key, const char *val, const void *pmsg, void *data);
 
+int convert_status_type(int status_type);
+
+void remove_app_manager_event_info_list(app_manager_event_info *head);
+
+#endif /* __TIZEN_APPFW_APP_MANAGER_INTERNAL_H */