From 332d0ccb80ea3360b478f3850b124dca32643d21 Mon Sep 17 00:00:00 2001 From: Son seungha Date: Mon, 29 May 2017 22:48:44 +0000 Subject: [PATCH] Revert "Revert "Pass pid as a function paramter"" This reverts commit 55d4ff8bc0f8d8849c44bd3c0fe420136cc2f01b. Change-Id: I1d3148d709192f995cc3720b8a5a370ffe814ece --- include/badge_service.h | 4 ++-- src/badge_service.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/badge_service.h b/include/badge_service.h index 3bbc725..6428739 100755 --- a/include/badge_service.h +++ b/include/badge_service.h @@ -23,8 +23,8 @@ extern int badge_service_fini(void); int badge_get_badge_existing(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_get_badge_list(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_insert(GVariant *parameters, GVariant **reply_body, uid_t uid); -int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid); -int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid); +int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid); +int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid); int badge_get_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_set_display_option(GVariant *parameters, GVariant **reply_body, uid_t uid); int badge_get_display_option(GVariant *parameters, GVariant **reply_body, const gchar *sender, uid_t uid); diff --git a/src/badge_service.c b/src/badge_service.c index 69ecfca..eec1691 100755 --- a/src/badge_service.c +++ b/src/badge_service.c @@ -70,6 +70,7 @@ static void _badge_dbus_method_call_handler(GDBusConnection *conn, GVariant *reply_body = NULL; int ret = BADGE_ERROR_INVALID_PARAMETER; uid_t uid = get_sender_uid(sender); + pid_t pid = get_sender_pid(sender); if (g_strcmp0(method_name, "badge_service_register") == 0) ret = service_register(parameters, &reply_body, sender, @@ -81,9 +82,9 @@ static void _badge_dbus_method_call_handler(GDBusConnection *conn, else if (g_strcmp0(method_name, "insert_badge") == 0) ret = badge_insert(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "delete_badge") == 0) - ret = badge_delete(parameters, &reply_body, uid); + ret = badge_delete(parameters, &reply_body, uid, pid); else if (g_strcmp0(method_name, "set_badge_count") == 0) - ret = badge_set_badge_count(parameters, &reply_body, uid); + ret = badge_set_badge_count(parameters, &reply_body, uid, pid); else if (g_strcmp0(method_name, "get_badge_count") == 0) ret = badge_get_badge_count(parameters, &reply_body, uid); else if (g_strcmp0(method_name, "set_disp_option") == 0) @@ -375,7 +376,7 @@ int badge_insert(GVariant *parameters, GVariant **reply_body, uid_t uid) } /* delete_badge */ -int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid) +int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid) { int ret = BADGE_ERROR_NONE; char *pkgname = NULL; @@ -389,11 +390,10 @@ int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid) if (ret != BADGE_ERROR_NONE) return ret; - if (pkgname != NULL && caller != NULL) { - ret = badge_db_delete(pkgname, caller, param_uid); - } else { + if (pkgname != NULL && caller != NULL) + ret = badge_db_delete(pkgname, caller, param_uid, pid); + else return BADGE_ERROR_INVALID_PARAMETER; - } if (ret != BADGE_ERROR_NONE) { ErrPrint("failed to delete badge :%d\n", ret); @@ -426,7 +426,7 @@ int badge_delete(GVariant *parameters, GVariant **reply_body, uid_t uid) } /* set_badge_count */ -int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid) +int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid, pid_t pid) { int ret = BADGE_ERROR_NONE; char *pkgname = NULL; @@ -447,7 +447,7 @@ int badge_set_badge_count(GVariant *parameters, GVariant **reply_body, uid_t uid badge_setting_refresh_setting_table(tzplatform_getuid(TZ_SYS_DEFAULT_USER)); need_to_reload_pkginfo_for_badge = 0; } - ret = badge_db_set_count(pkgname, caller, count, param_uid); + ret = badge_db_set_count(pkgname, caller, count, param_uid, pid); } else { return BADGE_ERROR_INVALID_PARAMETER; } -- 2.7.4