Merge private git and rsa git

Signed-off-by: adre.chang <adre.chang@samsung.com>

diff --git a/include/type/sms.h b/include/type/sms.h
index 89021026a482480900f3662817f4d609e0453ef0..3c272440919fd69eb939470929f476170e0f58a0 100755 (executable)
--- a/include/type/sms.h
+++ b/include/type/sms.h
@@ -856,11 +856,11 @@ struct treq_sms_get_cb_config {
 };
 
 struct treq_sms_set_cb_config {
-       int net3gppType;  /* < Type of 3gpp, 0x01 . 3gpp. 0x02 . 3gpp2 ( CDMA ) */
-       int cbEnabled; /* < CB service state. If cb_enabled is true then cell broadcast service will be enabled and underlying modem will enable CB Channel to receiving CB messages. Otherwise CB service will be disabled, underlying modem will deactivate the CB channel. ( enabled/disabled ) */
-       unsigned char msgIdMaxCount; /* < CB Channel List Max Count For Response */
-       int msgIdRangeCount; /* < Range of CB message ID count */
-       union telephony_sms_cb_msg_info_u msgIDs[SMS_GSM_SMS_CBMI_LIST_SIZE_MAX]; /* < Range of CB message ID information */
+       int net3gppType;  /**< Type of 3gpp, 0x01 . 3gpp. 0x02 . 3gpp2(CDMA) */
+       int cbEnabled; /**< CB service state. If cb_enabled is true then cell broadcast service will be enabled and underlying modem will enable CB Channel to receiving CB messages. Otherwise CB service will be disabled, underlying modem will deactivate the CB channel. (enabled/disabled) */
+       unsigned char msgIdMaxCount; /**< CB Channel List Max Count For Response */
+       int msgIdRangeCount; /**< Range of CB message ID count */
+       union telephony_sms_cb_msg_info_u msgIDs[SMS_GSM_SMS_CBMI_LIST_SIZE_MAX]; /**< Range of CB message ID information */
 };
 
 struct treq_sms_set_mem_status {

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 73575519bd56c6996e8b3ecff2475e3c134d2370..4d7c1bd89c247b0d98cfbadb541292b379bb4314 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -44,6 +44,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 #%doc COPYING
 %{_libdir}/libtcore*
+#%{_bindir}/*
 
 %files devel
 %defattr(-,root,root,-)

diff --git a/src/co_context.c b/src/co_context.c
index dce8a7fb28981a8e8adbcb9e82078902b7c9542d..3f1596c11d36acd33295e8de3ef6f6d4a1171c98 100644 (file)
--- a/src/co_context.c
+++ b/src/co_context.c
@@ -712,6 +712,7 @@ void tcore_context_cp_service_info(CoreObject *dest, CoreObject *src)
        memcpy(&(d_po->dns_primary_v4), &(s_po->dns_primary_v4), sizeof(union tcore_ip4_type));
        memcpy(&(d_po->dns_secondary_v4), &(s_po->dns_secondary_v4), sizeof(union tcore_ip4_type));
        memcpy(&(d_po->gateway_v4), &(s_po->gateway_v4), sizeof(union tcore_ip4_type));
+       memcpy(d_po->devname, s_po->devname, sizeof(char) * 16);
 
        return;
 }

diff --git a/src/util.c b/src/util.c
index cfdd3556b976a6ffb4588321de646aa44c4890ac..0f3c2a025f5ebcb70f6aa6841b6782d6181c5d13 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -653,7 +653,7 @@ GHashTable *tcore_util_marshal_deserialize_string(const gchar *serialized_string
                return ht;
        }
 
-       tuple = g_strsplit((gchar *) serialized_string, "/", 0);
+       tuple = g_strsplit((gchar *) serialized_string, " ", 0);
 
        while (strlen(tuple[index]) > 3) {
                int tmp = 0;
@@ -713,7 +713,7 @@ gchar *tcore_util_marshal_serialize(GHashTable *ht)
                encoded_d = g_base64_encode((guchar *)tmp, (gsize)strlen(tmp));
                g_free(tmp);
 
-               g_string_append_printf(gstring_tmp, "%s:%d:%s/", (gchar *)key,
+               g_string_append_printf(gstring_tmp, "%s:%d:%s ", (gchar *)key,
                                gtype, encoded_d);
                g_free((gpointer)encoded_d);
                g_value_unset(&gval);