Release version 0.15.0

[platform/core/appfw/slp-pkgmgr.git] / client / src / pkgmgr_client_connection.c

diff --git a/client/src/pkgmgr_client_connection.c b/client/src/pkgmgr_client_connection.c
index 0832097..0c7d471 100644 (file)
--- a/client/src/pkgmgr_client_connection.c
+++ b/client/src/pkgmgr_client_connection.c
@@ -24,7 +24,6 @@
 #include <gio/gio.h>
 
 #include "package-manager.h"
-#include "package-manager-types.h"
 #include "pkgmgr_client_debug.h"
 #include "pkgmgr_client_internal.h"
 #include "../../installer/pkgmgr_installer.h"
@@ -240,23 +239,26 @@ static void __handle_pkg_signal(const gchar *signal_name,
        g_variant_iter_free(iter);
 }
 
-static void __handle_res_copy_event_signal(const gchar *signal_name,
+static void __handle_res_event_signal(const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
        uid_t target_uid;
        char *req_id;
        char *pkgid = NULL;
        char *status = NULL;
+       char *path = NULL;
+       pkgmgr_res_event_path_state state;
        struct cb_info *cb_info = (struct cb_info *)user_data;
        int signal_type;
        GVariant *extra_param = NULL;
-       pkgmgr_res_event_info_t event_info;
+       pkgmgr_res_event_info_t *event_info;
+       GVariantIter *iter;
 
-       if (!cb_info->res_copy_event_cb)
+       if (!cb_info->res_event_cb)
                return;
 
        g_variant_get(parameters, "(u&s&s&sv)", &target_uid, &req_id, &pkgid, &status, &extra_param);
-       if (!g_variant_type_equal(G_VARIANT_TYPE("(i)"),
+       if (!g_variant_type_equal(G_VARIANT_TYPE("(ia(si))"),
                        g_variant_get_type(extra_param))) {
                ERR("invalid extra parameter");
                g_variant_unref(extra_param);
@@ -275,10 +277,47 @@ static void __handle_res_copy_event_signal(const gchar *signal_name,
                }
        }
 
-       g_variant_get(extra_param, "(i)", &event_info.error_code);
-       cb_info->res_copy_event_cb(target_uid, cb_info->req_id, pkgid, signal_name,
-                       status, &event_info, cb_info->data);
+       event_info = pkgmgr_res_event_info_new();
+       if (event_info == NULL) {
+               ERR("out of memory");
+               g_variant_unref(extra_param);
+               return;
+       }
+
+       g_variant_get(extra_param, "(ia(si))", &event_info->error_code, &iter);
+
+       while (g_variant_iter_loop(iter, "(&si)", &path, &state)) {
+               if (pkgmgr_res_event_info_add_path_state(event_info,
+                               path, state) != PKGMGR_R_OK) {
+                       ERR("Fail to add path state");
+                       g_variant_unref(extra_param);
+                       g_variant_iter_free(iter);
+                       pkgmgr_res_event_info_free(event_info);
+                       return;
+               }
+       }
+       cb_info->res_event_cb(target_uid, cb_info->req_id, pkgid, signal_name,
+                       status, event_info, cb_info->data);
        g_variant_unref(extra_param);
+       g_variant_iter_free(iter);
+       pkgmgr_res_event_info_free(event_info);
+}
+
+static void __handle_pkg_upgrade_event_signal(const gchar *signal_name,
+               GVariant *parameters, gpointer user_data)
+{
+       guint32 progress;
+       struct cb_info *cb_info = (struct cb_info *)user_data;
+
+       if (!cb_info->upgrade_event_cb)
+               return;
+
+       if (strcmp(signal_name, PKGMGR_INSTALLER_PKG_UPGRADE_EVENT_STR) != 0) {
+               return;
+       }
+
+       g_variant_get(parameters, "(u)", &progress);
+       cb_info->upgrade_event_cb(progress, cb_info->data);
 }
 
 static void __signal_handler(GDBusConnection *conn, const gchar *sender_name,
@@ -291,8 +330,11 @@ static void __signal_handler(GDBusConnection *conn, const gchar *sender_name,
                __handle_pkg_signal(signal_name, parameters, user_data);
        } else if (!strcmp(signal_name, PKGMGR_INSTALLER_RES_COPY_EVENT_STR) ||
                        !strcmp(signal_name, PKGMGR_INSTALLER_RES_REMOVE_EVENT_STR) ||
-                       !strcmp(signal_name, PKGMGR_INSTALLER_RES_UNINSTALL_EVENT_STR)) {
-               __handle_res_copy_event_signal(signal_name, parameters, user_data);
+                       !strcmp(signal_name, PKGMGR_INSTALLER_RES_UNINSTALL_EVENT_STR) ||
+                       !strcmp(signal_name, PKGMGR_INSTALLER_RES_CREATE_DIR_EVENT_STR)) {
+               __handle_res_event_signal(signal_name, parameters, user_data);
+       } else if (!strcmp(signal_name, PKGMGR_INSTALLER_PKG_UPGRADE_EVENT_STR)) {
+               __handle_pkg_upgrade_event_signal(signal_name, parameters, user_data);
        }
 }