From: MyoungJune Park Date: Wed, 5 Dec 2012 06:17:08 +0000 (+0900) Subject: modified appid format X-Git-Tag: accepted/tizen_2.1/20130425.022820~31^2~123 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d0e8ca443b4c2719425eff19250cf2ca41a0a7b;p=apps%2Fcore%2Fpreloaded%2Fsettings.git modified appid format Change-Id: Ib32fa3f9cbdbcfe8b5025b39883d843707ddf829 --- diff --git a/src/setting-plugin.c b/src/setting-plugin.c index f21ca3e..24463fe 100755 --- a/src/setting-plugin.c +++ b/src/setting-plugin.c @@ -191,6 +191,9 @@ void setting_drawer_list_fini() #define DBUS_PATH "/setting/dbus_handler" #define DBUS_SIGNAL_INTERFACE "org.tizen.setting.signal" +#define APPID_LENGTH 10 +#define APPID_POS_FROM_PATH 10 + static char* s_pkg_name; static char* substring(const char* str, size_t begin, size_t len) @@ -205,11 +208,12 @@ static char* substring(const char* str, size_t begin, size_t len) * package ID * * ncbyusjryr.AppSetting --> package ID is ncbyusjryr + * "Update_" "ncbyusjryr" */ static char* get_app_string(char* path) { SETTING_TRACE_BEGIN; - char* temp = substring(path, 10, 10/*string size*/); + char* temp = substring(path, APPID_POS_FROM_PATH, APPID_LENGTH/*string size*/); SETTING_TRACE("package ID : >>> %s ",temp ); return temp; } @@ -231,9 +235,24 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess setting_main_appdata *ad = user_data; char* pkg_name = get_app_string(ad->plugin_path); - s_pkg_name = pkg_name; - if (dbus_message_is_signal(message, DBUS_SIGNAL_INTERFACE, pkg_name)) + char str_buf[MAX_COMMON_BUFFER_LEN]; + snprintf(str_buf, MAX_COMMON_BUFFER_LEN, "Update_%s", pkg_name); + s_pkg_name = strdup(str_buf); + + if (pkg_name) + { + free(pkg_name); + pkg_name = NULL; + } + + if (s_pkg_name == NULL) + { + SETTING_TRACE("s_pkg_name is NULL - it's abnormal operation"); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + SETTING_TRACE("s_pkg_name : %s ", s_pkg_name); + if (dbus_message_is_signal(message, DBUS_SIGNAL_INTERFACE, s_pkg_name)) { if (dbus_message_get_args(message, &error, DBUS_TYPE_UINT32, &sender_pid, @@ -302,7 +321,11 @@ static int __send_msg(char* key, char* value) if (bus == NULL) return -1; - if (s_pkg_name == NULL) return -1; + if (s_pkg_name == NULL) + { + SETTING_TRACE("s_pkg_name is NULL - it's abnormal operation"); + return -1; + } message = dbus_message_new_signal(DBUS_PATH, DBUS_SIGNAL_INTERFACE, s_pkg_name);