From: Junghwan Song <jump.song@samsung.com>
Date: Tue, 28 Aug 2012 11:56:11 +0000 (+0900)
Subject: sync with private git
X-Git-Tag: 2.0_alpha~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca4830ab94cbef251f6c8d921480f52841fe908a;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-atmodem.git

sync with private git
---

diff --git a/packaging/tel-plugin-atmodem.spec b/packaging/tel-plugin-atmodem.spec
index 1797549..2ecd824 100644
--- a/packaging/tel-plugin-atmodem.spec
+++ b/packaging/tel-plugin-atmodem.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/t/tel-plugin-atmodem
 Name: tel-plugin-atmodem
 Summary: Telephony AT Modem library
-Version: 0.1.17
+Version: 0.1.18
 Release:    1
 Group:      System/Libraries
 License:    Apache
diff --git a/src/s_sim.c b/src/s_sim.c
index 1ca7d49..6d56ad7 100644
--- a/src/s_sim.c
+++ b/src/s_sim.c
@@ -45,6 +45,8 @@ extern struct ATResponse *sp_response;
 extern char *s_responsePrefix;
 extern enum ATCommandType s_type;
 
+int SimMetaInfoType = 0;	// 0: ATReqMetaInfo, 1: s_sim_property
+
 #define SWAPBYTES16(x) \
 { \
     unsigned short int data = *(unsigned short int*)&(x); \
@@ -864,13 +866,15 @@ static void on_confirmation_sim_message_send( TcorePending *p, gboolean result,
 
 	dbg("********************************tcore_user_request_get_command[0x%x]", tcore_user_request_get_command(ur));
 
-	if(tcore_user_request_get_command(ur) == TREQ_CUSTOM)
+	if(SimMetaInfoType == 1)  // s_sim_property
 	{
 		file_meta = (struct s_sim_property *)tcore_user_request_ref_metainfo(ur,&info_len);
 		metainfo = &(file_meta->metainfo);
 
 		dbg("file_meta->type[%d]", file_meta->metainfo.type);
 		dbg("metainfo->type[%d]", metainfo->type);
+
+		SimMetaInfoType = 0;	// 0: ATReqMetaInfo, 1: s_sim_property
 	}
 	else
 	{
@@ -1634,7 +1638,7 @@ static TReturn _get_file_info(CoreObject *o, UserRequest *ur, const enum tel_sim
 	memcpy(file_meta.metainfo.responsePrefix,"+CRSM:",strlen("+CRSM:"));
 	info_len = sizeof(struct s_sim_property);
 
-	tcore_user_request_set_command(ur, TREQ_CUSTOM);
+	SimMetaInfoType = 1;	// s_sim_property
 
 	trt = tcore_user_request_set_metainfo(ur, sizeof(struct s_sim_property), &file_meta);
 	dbg("trt[%d]",trt);
@@ -2428,7 +2432,8 @@ static TReturn s_get_facility_status(CoreObject *o, UserRequest *ur)
 	sec_meta.metainfo.type = SINGLELINE;
 	memcpy(sec_meta.metainfo.responsePrefix,"+CLCK:",strlen("+CLCK:"));
 	info_len = sizeof(struct s_sim_property);
-	tcore_user_request_set_command(ur, TREQ_CUSTOM);
+
+	SimMetaInfoType = 1;	// s_sim_property;
 	trt = tcore_user_request_set_metainfo(ur, sizeof(struct s_sim_property), &sec_meta);
 	dbg("trt[%d]",trt);
 
@@ -2498,7 +2503,8 @@ static TReturn s_enable_facility(CoreObject *o, UserRequest *ur)
 	sec_meta.metainfo.type = SINGLELINE;
 	memcpy(sec_meta.metainfo.responsePrefix,"+CLCK:",strlen("+CLCK:"));
 	info_len = sizeof(struct s_sim_property);
-	tcore_user_request_set_command(ur, TREQ_CUSTOM);
+
+	SimMetaInfoType = 1;	// s_sim_property
 	tcore_user_request_set_metainfo(ur, sizeof(struct s_sim_property), &sec_meta);
 
 	// AT+CLCK=<fac>,<mode>,<password>
@@ -2567,7 +2573,8 @@ static TReturn s_disable_facility(CoreObject *o, UserRequest *ur)
 	sec_meta.metainfo.type = SINGLELINE;
 	memcpy(sec_meta.metainfo.responsePrefix,"+CLCK:",strlen("+CLCK:"));
 	info_len = sizeof(struct s_sim_property);
-	tcore_user_request_set_command(ur, TREQ_CUSTOM);
+
+	SimMetaInfoType = 1;	// s_sim_property
 	tcore_user_request_set_metainfo(ur, sizeof(struct s_sim_property), &sec_meta);
 
 	// AT+CLCK=<fac>,<mode>,<password>