Clean up event signal related code 20/73620/9
authorSangyoon Jang <s89.jang@samsung.com>
Mon, 29 Aug 2016 06:06:30 +0000 (15:06 +0900)
committerSangyoon Jang <s89.jang@samsung.com>
Mon, 29 Aug 2016 06:57:41 +0000 (15:57 +0900)
- Use PKGMGR_XXX instead of COMM_XXX
- Subscribe gdbus signal only once
- Remove unused variables

Change-Id: Ib65544c2ba963493ce7cb23eeb816412689819b5
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
client/include/comm_config.h [deleted file]
client/include/package-manager.h
client/src/comm_client_gdbus.c
client/src/pkgmgr.c
installer/pkgmgr_installer.c
installer/pkgmgr_installer_config.h
installer/pkgmgr_installer_signal_agent.c

diff --git a/client/include/comm_config.h b/client/include/comm_config.h
deleted file mode 100644 (file)
index 3e1802f..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * slp-pkgmgr
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Jayoun Lee <airjany@samsung.com>, Sewook Park <sewook7.park@samsung.com>,
- * Jaeho Lee <jaeho81.lee@samsung.com>, Shobhit Srivastava <shobhit.s@samsung.com>
- *
- * 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 __COMM_CONFIG_H__
-#define __COMM_CONFIG_H__
-
-#include <stdlib.h>            /* for NULL */
-#include <libgen.h>
-
-/* from comm_pkg_mgr.xml
- */
-#define COMM_PKGMGR_DBUS_SERVICE "org.tizen.pkgmgr"
-#define COMM_PKGMGR_DBUS_OBJECT_PATH "/org/tizen/pkgmgr"
-#define COMM_PKGMGR_DBUS_INTERFACE "org.tizen.pkgmgr"
-
-/* from comm_status_broadcast
- */
-#define COMM_STATUS_BROADCAST_INTERFACE "org.tizen.pkgmgr.signal"
-#define COMM_STATUS_BROADCAST_OBJECT_PATH "/org/tizen/pkgmgr/signal"
-#define COMM_STATUS_BROADCAST_SIGNAL_STATUS "status"
-#define COMM_STATUS_BROADCAST_EVENT_INSTALL "install"
-#define COMM_STATUS_BROADCAST_EVENT_UNINSTALL "uninstall"
-#define COMM_STATUS_BROADCAST_EVENT_MOVE "move"
-#define COMM_STATUS_BROADCAST_EVENT_INSTALL_PROGRESS "install_progress"
-#define COMM_STATUS_BROADCAST_EVENT_UPGRADE "upgrade"
-#define COMM_STATUS_BROADCAST_EVENT_GET_SIZE "get_size"
-#define COMM_STATUS_BROADCAST_EVENT_ENABLE_APP "enable_app"
-#define COMM_STATUS_BROADCAST_EVENT_DISABLE_APP "disable_app"
-#define COMM_STATUS_BROADCAST_EVENT_ENABLE_APP_SPLASH_SCREEN "enable_app_splash_screen"
-#define COMM_STATUS_BROADCAST_EVENT_DISABLE_APP_SPLASH_SCREEN "disable_app_splash_screen"
-
-
-/********
- * enums
- ********/
-
-/* req_type */
-enum {
-       /* to installer */
-       COMM_REQ_TO_INSTALLER = 1,
-
-       /* to activator */
-       COMM_REQ_TO_ACTIVATOR,
-
-       /* to clearer */
-       COMM_REQ_TO_CLEARER,
-
-       /* to mover*/
-       COMM_REQ_TO_MOVER,
-
-       /* cancel job */
-       COMM_REQ_CANCEL,
-
-       /*get package size */
-       COMM_REQ_GET_SIZE,
-
-       /*kill app */
-       COMM_REQ_KILL_APP,
-
-       /*check app */
-       COMM_REQ_CHECK_APP,
-
-       /* to cache clear */
-       COMM_REQ_CLEAR_CACHE_DIR,
-
-       COMM_REQ_MAX_SENTINEL
-};
-
-/* return value */
-enum {
-       COMM_RET_NOMEM = -2,
-       COMM_RET_ERROR = -1,
-       COMM_RET_OK = 0,
-       COMM_RET_QUEUED,
-
-       COMM_RET_MAX_SENTINEL
-};
-
-/* broadcast type */
-enum {
-       COMM_STATUS_BROADCAST_ALL = 0x3FF,
-       COMM_STATUS_BROADCAST_INSTALL = 0x01,
-       COMM_STATUS_BROADCAST_UNINSTALL = 0x02,
-       COMM_STATUS_BROADCAST_MOVE = 0x04,
-       COMM_STATUS_BROADCAST_INSTALL_PROGRESS = 0x08,
-       COMM_STATUS_BROADCAST_UPGRADE = 0x10,
-       COMM_STATUS_BROADCAST_GET_SIZE = 0x20,
-       COMM_STATUS_BROADCAST_ENABLE_APP = 0x40,
-       COMM_STATUS_BROADCAST_DISABLE_APP = 0x80,
-       COMM_STATUS_BROADCAST_ENABLE_APP_SPLASH_SCREEN = 0x100,
-       COMM_STATUS_BROADCAST_DISABLE_APP_SPLASH_SCREEN = 0x200,
-};
-
-#endif                         /* __COMM_CONFIG_H__ */
index 7ca2a44be40f5e46cd7d849eaacc6b565656628a..f7fdeb53144fb6535dd3c48f74fa318ba3ddc970 100644 (file)
@@ -102,18 +102,18 @@ extern "C" {
 /**
  * @brief listening status type in pkgmgr.
  */
-#define PKGMGR_CLIENT_STATUS_ALL                               0x00
-#define PKGMGR_CLIENT_STATUS_INSTALL                           0x01
-#define PKGMGR_CLIENT_STATUS_UNINSTALL                         0x02
-#define PKGMGR_CLIENT_STATUS_UPGRADE                           0x04
-#define PKGMGR_CLIENT_STATUS_MOVE                              0x08
-#define PKGMGR_CLIENT_STATUS_CLEAR_DATA                                0x10
-#define PKGMGR_CLIENT_STATUS_INSTALL_PROGRESS                  0x20
-#define PKGMGR_CLIENT_STATUS_GET_SIZE                          0x40
-#define PKGMGR_CLIENT_STATUS_ENABLE_APP                                0x80
-#define PKGMGR_CLIENT_STATUS_DISABLE_APP                       0x100
-#define PKGMGR_CLIENT_STATUS_ENABLE_APP_SPLASH_SCREEN          0x200
-#define PKGMGR_CLIENT_STATUS_DISABLE_APP_SPLASH_SCREEN         0x400
+#define PKGMGR_CLIENT_STATUS_ALL                               0x03FF
+#define PKGMGR_CLIENT_STATUS_INSTALL                           0x0001
+#define PKGMGR_CLIENT_STATUS_UNINSTALL                         0x0002
+#define PKGMGR_CLIENT_STATUS_UPGRADE                           0x0004
+#define PKGMGR_CLIENT_STATUS_MOVE                              0x0008
+#define PKGMGR_CLIENT_STATUS_CLEAR_DATA                                0x0010
+#define PKGMGR_CLIENT_STATUS_INSTALL_PROGRESS                  0x0020
+#define PKGMGR_CLIENT_STATUS_GET_SIZE                          0x0040
+#define PKGMGR_CLIENT_STATUS_ENABLE_APP                                0x0080
+#define PKGMGR_CLIENT_STATUS_DISABLE_APP                       0x0100
+#define PKGMGR_CLIENT_STATUS_ENABLE_APP_SPLASH_SCREEN          0x0200
+#define PKGMGR_CLIENT_STATUS_DISABLE_APP_SPLASH_SCREEN         0x0400
 
 /** @} */
 
index 23c25cc9953f04e452531cd0eda13ddf9af87872..316042949e3f4a26157debc58f4245068e6cc7a2 100644 (file)
  *
  */
 
-
-#include <glib.h>
-#include <gio/gio.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <glib.h>
 #include <gio/gio.h>
 
-#include "comm_config.h"
 #include "comm_client.h"
 #include "pkgmgr-debug.h"
 #include "package-manager.h"
+#include "../../installer/pkgmgr_installer.h"
+#include "../../installer/pkgmgr_installer_config.h"
 
 #define COMM_CLIENT_RETRY_MAX 5
 #define COMM_CLIENT_WAIT_USEC (1000000 / 2) /* 0.5 sec */
@@ -61,28 +60,26 @@ static int __get_signal_type(const char *name)
        if (name == NULL)
                return -1;
 
-       if (strcmp(name, COMM_STATUS_BROADCAST_SIGNAL_STATUS) == 0)
-               return COMM_STATUS_BROADCAST_ALL;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_INSTALL) == 0)
-               return COMM_STATUS_BROADCAST_INSTALL;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_UNINSTALL) == 0)
-               return COMM_STATUS_BROADCAST_UNINSTALL;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_MOVE) == 0)
-               return COMM_STATUS_BROADCAST_MOVE;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_INSTALL_PROGRESS) == 0)
-               return COMM_STATUS_BROADCAST_INSTALL_PROGRESS;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_UPGRADE) == 0)
-               return COMM_STATUS_BROADCAST_UPGRADE;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_GET_SIZE) == 0)
-               return COMM_STATUS_BROADCAST_GET_SIZE;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_ENABLE_APP) == 0)
-               return COMM_STATUS_BROADCAST_ENABLE_APP;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_DISABLE_APP) == 0)
-               return COMM_STATUS_BROADCAST_DISABLE_APP;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_ENABLE_APP_SPLASH_SCREEN) == 0)
-               return COMM_STATUS_BROADCAST_ENABLE_APP_SPLASH_SCREEN;
-       else if (strcmp(name, COMM_STATUS_BROADCAST_EVENT_DISABLE_APP_SPLASH_SCREEN) == 0)
-               return COMM_STATUS_BROADCAST_DISABLE_APP_SPLASH_SCREEN;
+       if (strcmp(name, PKGMGR_INSTALLER_INSTALL_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_INSTALL;
+       else if (strcmp(name, PKGMGR_INSTALLER_UNINSTALL_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_UNINSTALL;
+       else if (strcmp(name, PKGMGR_INSTALLER_MOVE_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_MOVE;
+       else if (strcmp(name, PKGMGR_INSTALLER_INSTALL_PERCENT_KEY_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_INSTALL_PROGRESS;
+       else if (strcmp(name, PKGMGR_INSTALLER_UPGRADE_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_UPGRADE;
+       else if (strcmp(name, PKGMGR_INSTALLER_GET_SIZE_KEY_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_GET_SIZE;
+       else if (strcmp(name, PKGMGR_INSTALLER_APP_ENABLE_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_ENABLE_APP;
+       else if (strcmp(name, PKGMGR_INSTALLER_APP_DISABLE_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_DISABLE_APP;
+       else if (strcmp(name, PKGMGR_INSTALLER_APP_ENABLE_SPLASH_SCREEN_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_ENABLE_APP_SPLASH_SCREEN;
+       else if (strcmp(name, PKGMGR_INSTALLER_APP_DISABLE_SPLASH_SCREEN_EVENT_STR) == 0)
+               return PKGMGR_CLIENT_STATUS_DISABLE_APP_SPLASH_SCREEN;
        else
                return -1;
 }
@@ -99,7 +96,7 @@ void _on_signal_handle_filter(GDBusConnection *conn,
                GVariant *parameters,
                gpointer user_data)
 {
-       if (interface_name && strcmp(interface_name, "org.tizen.pkgmgr.signal")) {
+       if (interface_name && strcmp(interface_name, PKGMGR_INSTALLER_DBUS_INTERFACE)) {
                DBG("Interface name did not match. Drop the message");
                return;
        }
@@ -257,9 +254,9 @@ int comm_client_request(comm_client *cc, const char *method, GVariant *params,
 
        do {
                proxy = g_dbus_proxy_new_sync(cc->conn, G_DBUS_PROXY_FLAGS_NONE,
-                               NULL, COMM_PKGMGR_DBUS_SERVICE,
-                               COMM_PKGMGR_DBUS_OBJECT_PATH,
-                               COMM_PKGMGR_DBUS_INTERFACE, NULL, &error);
+                               NULL, PKGMGR_DBUS_SERVICE,
+                               PKGMGR_DBUS_OBJECT_PATH,
+                               PKGMGR_DBUS_INTERFACE, NULL, &error);
                if (proxy == NULL) {
                        ERR("failed to get proxy object, sleep and retry[%s]",
                                        error->message);
@@ -305,10 +302,10 @@ int comm_client_request(comm_client *cc, const char *method, GVariant *params,
 int
 comm_client_set_status_callback(int comm_status_type, comm_client *cc, status_cb cb, void *cb_data)
 {
-       int r = COMM_RET_ERROR;
+       int r = PKGMGR_R_OK;
 
        if (cc == NULL)
-               return COMM_RET_ERROR;
+               return PKGMGR_R_ERROR;
 
        /* Create new sig_cb_data */
        cc->sig_cb_data = calloc(1, sizeof(struct signal_callback_data));
@@ -317,20 +314,22 @@ comm_client_set_status_callback(int comm_status_type, comm_client *cc, status_cb
                (cc->sig_cb_data)->cb = cb;
                (cc->sig_cb_data)->cb_data = cb_data;
        } else {
-               r = COMM_RET_ERROR;
+               r = PKGMGR_R_ERROR;
                goto ERROR_CLEANUP;
        }
        /* Add a filter for signal */
-       cc->subscription_id = g_dbus_connection_signal_subscribe(cc->conn, NULL, "org.tizen.pkgmgr.signal",
-               NULL, NULL, NULL, G_DBUS_SIGNAL_FLAGS_NONE,
-               _on_signal_handle_filter, (gpointer)cc->sig_cb_data, _free_sig_cb_data);
+       cc->subscription_id = g_dbus_connection_signal_subscribe(cc->conn, NULL,
+                       PKGMGR_INSTALLER_DBUS_INTERFACE, NULL,
+                       PKGMGR_INSTALLER_DBUS_OBJECT_PATH, NULL,
+                       G_DBUS_SIGNAL_FLAGS_NONE, _on_signal_handle_filter,
+                       (gpointer)cc->sig_cb_data, _free_sig_cb_data);
        if (!cc->subscription_id) {
                ERR("Failed to add filter\n");
-               r = COMM_RET_ERROR;
+               r = PKGMGR_R_ERROR;
                goto ERROR_CLEANUP;
        }
 
-       return COMM_RET_OK;
+       return PKGMGR_R_OK;
 
 ERROR_CLEANUP:
        ERR("General error");
index 97a975c473bbde30b07039a5893179c858298b6c..ace0555c8d58468a5a46acf4b3098287bd99828f 100644 (file)
@@ -41,7 +41,6 @@
 #include "pkgmgr-internal.h"
 #include "pkgmgr-debug.h"
 #include "comm_client.h"
-#include "comm_config.h"
 
 /* API export macro */
 #ifndef API
@@ -739,7 +738,7 @@ static int __change_op_cb_for_getsize(pkgmgr_client *pc)
        mpc->info.request.cc = comm_client_new(PC_REQUEST);
        retvm_if(mpc->info.request.cc == NULL, PKGMGR_R_ERROR, "client creation failed");
 
-       ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_GET_SIZE, mpc->info.request.cc, __operation_callback, pc);
+       ret = comm_client_set_status_callback(PKGMGR_CLIENT_STATUS_GET_SIZE, mpc->info.request.cc, __operation_callback, pc);
        retvm_if(ret < 0, PKGMGR_R_ERROR, "set_status_callback() failed - %d", ret);
 
        return PKGMGR_R_OK;
@@ -776,10 +775,7 @@ static int __change_op_cb_for_enable_disable(pkgmgr_client *pc, bool is_disable)
        mpc->info.request.cc = comm_client_new(PC_REQUEST);
        retvm_if(mpc->info.request.cc == NULL, PKGMGR_R_ERROR, "client creation failed");
 
-       if (is_disable)
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_DISABLE_APP, mpc->info.request.cc, __operation_callback, pc);
-       else
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_ENABLE_APP, mpc->info.request.cc, __operation_callback, pc);
+       ret = comm_client_set_status_callback(mpc->status_type, mpc->info.request.cc, __operation_callback, pc);
        retvm_if(ret < 0, PKGMGR_R_ERROR, "set_status_callback() failed - %d", ret);
 
        return PKGMGR_R_OK;
@@ -861,13 +857,13 @@ API pkgmgr_client *pkgmgr_client_new(client_type ctype)
                pc->info.request.cc = comm_client_new(PC_REQUEST);
                trym_if(pc->info.request.cc == NULL, "client creation failed");
 
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_ALL, pc->info.request.cc, __operation_callback, pc);
+               ret = comm_client_set_status_callback(PKGMGR_CLIENT_STATUS_ALL, pc->info.request.cc, __operation_callback, pc);
                trym_if(ret < 0L, "comm_client_set_status_callback() failed - %d", ret);
        } else if (pc->ctype == PC_LISTENING) {
                pc->info.listening.cc = comm_client_new(PC_LISTENING);
                trym_if(pc->info.listening.cc == NULL, "client creation failed");
 
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_ALL, pc->info.listening.cc, __status_callback, pc);
+               ret = comm_client_set_status_callback(PKGMGR_CLIENT_STATUS_ALL, pc->info.listening.cc, __status_callback, pc);
                trym_if(ret < 0L, "comm_client_set_status_callback() failed - %d", ret);
        }
 
@@ -997,15 +993,8 @@ static int __change_op_cb_for_enable_disable_splash_screen(pkgmgr_client *pc,
                return PKGMGR_R_ENOMEM;
        }
 
-       if (is_enable)
-               ret = comm_client_set_status_callback(
-                               COMM_STATUS_BROADCAST_ENABLE_APP_SPLASH_SCREEN,
-                               mpc->info.request.cc, __operation_callback, pc);
-       else
-               ret = comm_client_set_status_callback(
-                               COMM_STATUS_BROADCAST_DISABLE_APP_SPLASH_SCREEN,
-                               mpc->info.request.cc, __operation_callback, pc);
-
+       ret = comm_client_set_status_callback(mpc->status_type,
+                       mpc->info.request.cc, __operation_callback, pc);
        if (ret < 0) {
                ERR("set_status_callback() failed - %d", ret);
                return PKGMGR_R_ERROR;
@@ -1705,50 +1694,8 @@ API int pkgmgr_client_set_status_type(pkgmgr_client *pc, int status_type)
        mpc->info.listening.cc = comm_client_new(PC_LISTENING);
        retvm_if(mpc->info.listening.cc == NULL, PKGMGR_R_EINVAL, "client creation failed");
 
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_INSTALL) == PKGMGR_CLIENT_STATUS_INSTALL) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_INSTALL, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "PKGMGR_CLIENT_STATUS_INSTALL failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_UNINSTALL) == PKGMGR_CLIENT_STATUS_UNINSTALL) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_UNINSTALL, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_UNINSTALL failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_MOVE) == PKGMGR_CLIENT_STATUS_MOVE) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_MOVE, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_MOVE failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_INSTALL_PROGRESS) == PKGMGR_CLIENT_STATUS_INSTALL_PROGRESS) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_INSTALL_PROGRESS, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_INSTALL_PROGRESS failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_UPGRADE) == PKGMGR_CLIENT_STATUS_UPGRADE) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_UPGRADE, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_UPGRADE failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_ENABLE_APP) == PKGMGR_CLIENT_STATUS_ENABLE_APP) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_ENABLE_APP, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_ENABLE_APP failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_DISABLE_APP) == PKGMGR_CLIENT_STATUS_DISABLE_APP) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_DISABLE_APP, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_DISABLE_APP failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_ENABLE_APP_SPLASH_SCREEN) == PKGMGR_CLIENT_STATUS_ENABLE_APP_SPLASH_SCREEN) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_ENABLE_APP_SPLASH_SCREEN, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_ENABLE_APP_SPLASH_SCREEN failed - %d", ret);
-       }
-
-       if ((mpc->status_type & PKGMGR_CLIENT_STATUS_DISABLE_APP_SPLASH_SCREEN) == PKGMGR_CLIENT_STATUS_DISABLE_APP_SPLASH_SCREEN) {
-               ret = comm_client_set_status_callback(COMM_STATUS_BROADCAST_DISABLE_APP_SPLASH_SCREEN, mpc->info.listening.cc, __status_callback, pc);
-               retvm_if(ret < 0, PKGMGR_R_ECOMM, "COMM_STATUS_BROADCAST_DISABLE_APP_SPLASH_SCREEN failed - %d", ret);
-       }
+       ret = comm_client_set_status_callback(status_type, mpc->info.listening.cc, __status_callback, pc);
+       retvm_if(ret < 0, PKGMGR_R_ECOMM, "comm_client_set_status_callback failed - %d", ret);
 
        return PKGMGR_R_OK;
 }
index b031a06f196008f13667462ff079502e76841fd6..cd08e198668d1dfa1cd0650c987aa850b014315d 100644 (file)
@@ -38,8 +38,6 @@
 #include "pkgmgr_installer_debug.h"
 #include "pkgmgr_installer_info.h"
 
-#include "../client/include/comm_config.h"
-
 #include <pkgmgr-info.h>
 
 /* API export macro */
 #define CHK_PI_RET(r) \
        do { if (NULL == pi) return (r); } while (0)
 
+#define OPTVAL_PRELOAD 1000
+#define OPTVAL_FORCE_REMOVAL 1001
+
+/* Supported options */
+const char *short_opts = "k:l:i:d:c:m:t:o:r:p:s:b:e:M:y:u:w:D:A:q";
+const struct option long_opts[] = {
+       { "session-id", 1, NULL, 'k' },
+       { "license-path", 1, NULL, 'l' },
+       { "install", 1, NULL, 'i' },
+       { "uninstall", 1, NULL, 'd' },
+       { "clear", 1, NULL, 'c' },
+       { "move", 1, NULL, 'm' },
+       { "move-type", 1, NULL, 't' },
+       { "optional-data", 0, NULL, 'o' },
+       { "reinstall", 0, NULL, 'r' },
+       { "caller-pkgid", 1, NULL, 'p' },
+       { "tep-path", 1, NULL, 'e' },
+       { "tep-move", 1, NULL, 'M' },
+       { "smack", 1, NULL, 's' },
+       { "direct-manifest-install", 1, NULL, 'y' },
+       { "mount-install", 1, NULL, 'w' },
+       { "recovery", 1, NULL, 'b' },
+       { "preload", 0, NULL, OPTVAL_PRELOAD },
+       { "force-remove", 0, NULL, OPTVAL_FORCE_REMOVAL },
+       { 0, 0, 0, 0 }  /* sentinel */
+};
+
 struct pkgmgr_installer {
        int request_type;
        int move_type;
@@ -75,36 +100,36 @@ static uid_t g_target_uid;
 static const char *__get_signal_name(pkgmgr_installer *pi, const char *key)
 {
        if (strcmp(key, PKGMGR_INSTALLER_INSTALL_PERCENT_KEY_STR) == 0)
-               return COMM_STATUS_BROADCAST_EVENT_INSTALL_PROGRESS;
+               return key;
        else if (strcmp(key, PKGMGR_INSTALLER_GET_SIZE_KEY_STR) == 0)
-               return COMM_STATUS_BROADCAST_EVENT_GET_SIZE;
+               return key;
        else if (strcmp(key, PKGMGR_INSTALLER_APPID_KEY_STR) == 0)
-               return COMM_STATUS_BROADCAST_EVENT_UNINSTALL;
+               return PKGMGR_INSTALLER_UNINSTALL_EVENT_STR;
 
        switch (pi->request_type) {
        case PKGMGR_REQ_INSTALL:
        case PKGMGR_REQ_MANIFEST_DIRECT_INSTALL:
        case PKGMGR_REQ_MOUNT_INSTALL:
-               return COMM_STATUS_BROADCAST_EVENT_INSTALL;
+               return PKGMGR_INSTALLER_INSTALL_EVENT_STR;
        case PKGMGR_REQ_UNINSTALL:
-               return COMM_STATUS_BROADCAST_EVENT_UNINSTALL;
+               return PKGMGR_INSTALLER_UNINSTALL_EVENT_STR;
        case PKGMGR_REQ_UPGRADE:
-               return COMM_STATUS_BROADCAST_EVENT_UPGRADE;
+               return PKGMGR_INSTALLER_UPGRADE_EVENT_STR;
        case PKGMGR_REQ_MOVE:
-               return COMM_STATUS_BROADCAST_EVENT_MOVE;
+               return PKGMGR_INSTALLER_MOVE_EVENT_STR;
        case PKGMGR_REQ_ENABLE_APP:
-               return COMM_STATUS_BROADCAST_EVENT_ENABLE_APP;
+               return PKGMGR_INSTALLER_APP_ENABLE_EVENT_STR;
        case PKGMGR_REQ_DISABLE_APP:
-               return COMM_STATUS_BROADCAST_EVENT_DISABLE_APP;
+               return PKGMGR_INSTALLER_APP_DISABLE_EVENT_STR;
        case PKGMGR_REQ_ENABLE_APP_SPLASH_SCREEN:
-               return COMM_STATUS_BROADCAST_EVENT_ENABLE_APP_SPLASH_SCREEN;
+               return PKGMGR_INSTALLER_APP_ENABLE_SPLASH_SCREEN_EVENT_STR;
        case PKGMGR_REQ_DISABLE_APP_SPLASH_SCREEN:
-               return COMM_STATUS_BROADCAST_EVENT_DISABLE_APP_SPLASH_SCREEN;
+               return PKGMGR_INSTALLER_APP_DISABLE_SPLASH_SCREEN_EVENT_STR;
        }
 
-       ERR("cannot find type, send signal with type SIGNAL_STATUS");
+       ERR("cannot find type");
 
-       return COMM_STATUS_BROADCAST_SIGNAL_STATUS;
+       return NULL;
 }
 
 static int __send_signal_for_app_event(pkgmgr_installer *pi, const char *pkg_type,
@@ -128,8 +153,8 @@ static int __send_signal_for_app_event(pkgmgr_installer *pi, const char *pkg_typ
        }
 
        if (g_dbus_connection_emit_signal(pi->conn, NULL,
-                               COMM_STATUS_BROADCAST_OBJECT_PATH,
-                               COMM_STATUS_BROADCAST_INTERFACE, name,
+                               PKGMGR_INSTALLER_DBUS_OBJECT_PATH,
+                               PKGMGR_INSTALLER_DBUS_INTERFACE, name,
                                g_variant_new("(ussssss)", pi->target_uid, sid,
                                        pkg_type, pkgid, appid, key, val), &err)
                        != TRUE) {
@@ -162,8 +187,8 @@ static int __send_signal_for_event(pkgmgr_installer *pi, const char *pkg_type,
        }
 
        if (g_dbus_connection_emit_signal(pi->conn, NULL,
-                               COMM_STATUS_BROADCAST_OBJECT_PATH,
-                               COMM_STATUS_BROADCAST_INTERFACE, name,
+                               PKGMGR_INSTALLER_DBUS_OBJECT_PATH,
+                               PKGMGR_INSTALLER_DBUS_INTERFACE, name,
                                g_variant_new("(ussssss)", pi->target_uid, sid,
                                        pkg_type, pkgid, "", key, val), &err)
                        != TRUE) {
index 4fffcf2cf7f010ed534d479c9841629dfd518e96..320620be31b9f28f58e9900a3046602bba1c567d 100644 (file)
  *
  */
 
-
-
-
-
 #ifndef __PACKAGE_INSTALLER_CONFIG_H__
 #define __PACKAGE_INSTALLER_CONFIG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define OPTVAL_PRELOAD 1000
-#define OPTVAL_FORCE_REMOVAL 1001
-
-/* Supported options */
-const char *short_opts = "k:l:i:d:c:m:t:o:r:p:s:b:e:M:y:u:w:D:A:q";
-const struct option long_opts[] = {
-       { "session-id", 1, NULL, 'k' },
-       { "license-path", 1, NULL, 'l' },
-       { "install", 1, NULL, 'i' },
-       { "uninstall", 1, NULL, 'd' },
-       { "clear", 1, NULL, 'c' },
-       { "move", 1, NULL, 'm' },
-       { "move-type", 1, NULL, 't' },
-       { "optional-data", 0, NULL, 'o' },
-       { "reinstall", 0, NULL, 'r' },
-       { "caller-pkgid", 1, NULL, 'p' },
-       { "tep-path", 1, NULL, 'e' },
-       { "tep-move", 1, NULL, 'M' },
-       { "smack", 1, NULL, 's' },
-       { "direct-manifest-install", 1, NULL, 'y' },
-       { "mount-install", 1, NULL, 'w' },
-       { "recovery", 1, NULL, 'b' },
-       { "preload", 0, NULL, OPTVAL_PRELOAD },
-       { "force-remove", 0, NULL, OPTVAL_FORCE_REMOVAL },
-       { 0, 0, 0, 0 }  /* sentinel */
-};
+#define PKGMGR_DBUS_SERVICE "org.tizen.pkgmgr"
+#define PKGMGR_DBUS_INTERFACE "org.tizen.pkgmgr"
+#define PKGMGR_DBUS_OBJECT_PATH "/org/tizen/pkgmgr"
 
-#ifdef __cplusplus
-}
-#endif
+#define PKGMGR_INSTALLER_DBUS_INTERFACE "org.tizen.pkgmgr.signal"
+#define PKGMGR_INSTALLER_DBUS_OBJECT_PATH "/org/tizen/pkgmgr/signal"
 
 #endif                         /* __PACKAGE_INSTALLER_CONFIG_H__ */
index e96f963479b13f1ee29f3811ee3ab57e0bbf1a1f..666a52fca0b8a7ef67ea53e17852ebb207945afd 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <dlog.h>
 
-#include "../client/include/comm_config.h"
+#include "pkgmgr_installer_config.h"
 
 #ifdef LOG_TAG
 #undef LOG_TAG
@@ -127,8 +127,8 @@ static void __emit_signal(const char *name, GVariant *gv)
        GError *err = NULL;
 
        if (g_dbus_connection_emit_signal(conn, NULL,
-                               COMM_STATUS_BROADCAST_OBJECT_PATH,
-                               COMM_STATUS_BROADCAST_INTERFACE,
+                               PKGMGR_INSTALLER_DBUS_OBJECT_PATH,
+                               PKGMGR_INSTALLER_DBUS_INTERFACE,
                                name, gv, &err) != TRUE) {
                LOGE("g_dbus_connection_emit_signal failed: %s", err->message);
                g_error_free(err);