remove transmitted data unneccessarily

Change-Id: Ic4c25fc69339be54c4c2ba7fdf9289926a6e7957
Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>

diff --git a/common/account_mgr.xml b/common/account_mgr.xml
index a8a95d597bd348aa515453ac8150a6eaed40487f..8ca02968fafd36224b81dea55890f4f0f6d07b3d 100644 (file)
--- a/common/account_mgr.xml
+++ b/common/account_mgr.xml
@@ -2,136 +2,109 @@
 <node name="/org/tizen/account/manager">
   <interface name="org.tizen.account.manager">
     <method name="account_add">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_data" direction="in" />
       <arg type="i" name="account_db_id" direction="out" />
     </method>
     <method name="account_type_add">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_type_data" direction="in" />
       <arg type="i" name="account_type_db_id" direction="out" />
     </method>
     <method name="account_query_all">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="aa{sv}" name="account_data" direction="out" />
     </method>
     <method name="account_type_query_all">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="aa{sv}" name="account_type_data" direction="out" />
     </method>
     <method name="account_delete_from_db_by_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="i" name="account_db_id" direction="in" />
     </method>
     <method name="account_delete_from_db_by_user_name">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="user_name" direction="in" />
       <arg type="s" name="package_name" direction="in" />
     </method>
     <method name="account_delete_from_db_by_package_name">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="package_name" direction="in" />
       <arg type="b" name="permission" direction="in" />
     </method>
     <method name="account_update_to_db_by_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_data" direction="in" />
       <arg type="i" name="account_id" direction="in" />
     </method>
     <method name="account_get_total_count_from_db">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="b" name="include_hidden" direction="in" />
       <arg type="i" name="count" direction="out" />
     </method>
     <method name="account_query_account_by_account_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="i" name="account_db_id" direction="in" />
       <arg type="a{sv}" name="account_data" direction="out" />
     </method>
     <method name="account_update_to_db_by_user_name">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_data" direction="in" />
       <arg type="s" name="user_name" direction="in" />
       <arg type="s" name="package_name" direction="in" />
     </method>
     <method name="account_type_query_label_by_locale">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
       <arg type="s" name="locale" direction="in" />
       <arg type="s" name="label_name" direction="out" />
     </method>
     <method name="account_type_query_by_provider_feature">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="key" direction="in" />
       <arg type="aa{sv}" name="account_type_list_data" direction="out" />
     </method>
     <method name="account_query_account_by_user_name">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="user_name" direction="in" />
       <arg type="aa{sv}" name="account_list_data" direction="out" />
     </method>
     <method name="account_query_account_by_package_name">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="package_name" direction="in" />
       <arg type="aa{sv}" name="account_list_data" direction="out" />
     </method>
     <method name="account_query_account_by_capability">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="capability_type" direction="in" />
       <arg type="i" name="capability_value" direction="in" />
       <arg type="aa{sv}" name="account_list_data" direction="out" />
     </method>
     <method name="account_query_account_by_capability_type">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="capability_type" direction="in" />
       <arg type="aa{sv}" name="account_list_data" direction="out" />
     </method>
     <method name="account_query_capability_by_account_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="i" name="account_id" direction="in" />
       <arg type="aa{sv}" name="account_list_data" direction="out" />
     </method>
     <method name="account_update_sync_status_by_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="i" name="account_db_id" direction="in" />
       <arg type="i" name="sync_status" direction="in" />
     </method>
     <method name="account_type_query_provider_feature_by_app_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
       <arg type="a(ss)" name="feature_list_data" direction="out" />
     </method>
     <method name="account_type_query_supported_feature">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
       <arg type="s" name="capability" direction="in" />
       <arg type="i" name="is_supported" direction="out" />
     </method>
     <method name="account_type_update_to_db_by_app_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_type_variant" direction="in" />
       <arg type="s" name="app_id" direction="in" />
     </method>
     <method name="account_type_delete_by_app_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
     </method>
     <method name="account_type_query_label_by_app_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
       <arg type="a(sss)" name="label_list_variant" direction="out" />
     </method>
     <method name="account_type_query_by_app_id">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
       <arg type="a{sv}" name="account_type_variant" direction="out" />
     </method>
     <method name="account_type_query_app_id_exist">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="s" name="app_id" direction="in" />
     </method>
     <method name="account_update_to_db_by_id_ex">
-      <arg type="s" name="account_db_path" direction="in" />
       <arg type="a{sv}" name="account_variant" direction="in" />
       <arg type="i" name="account_id" direction="in" />
     </method>

diff --git a/common/src/account_ipc_marshal.c b/common/src/account_ipc_marshal.c
index adca4c01516002ee30be75578cb1dad4ccce69aa..b9dfbf8ae217caaf944a54cbc6ed5ab7ccee10eb 100644 (file)
--- a/common/src/account_ipc_marshal.c
+++ b/common/src/account_ipc_marshal.c
@@ -1232,9 +1232,11 @@ GVariant* marshal_user_txt_array(char* const* user_data_txt_array)
        {
                char key[256];
                ACCOUNT_SNPRINTF(key, strlen(ACCOUNT_DATA_KEY_USER_DATA_TXT)+3, "%s%d", ACCOUNT_DATA_KEY_USER_DATA_TXT, i);
-               g_variant_builder_add(&builder, "{sv}",
-                               key,
-                               g_variant_new_string(user_data_txt_array[i]));
+               if(user_data_txt_array[i] != NULL) {
+                       g_variant_builder_add(&builder, "{sv}",
+                                       key,
+                                       g_variant_new_string(user_data_txt_array[i]));
+               }
        }
 
        _INFO("marshal_user_data_int_list end");