From Alejandro Vaquero:

  replace the code that used g_strsplit_set and was broken by me
  changing it to g_strsplit with something that works


svn path=/trunk/; revision=13470

1 files changed, 4 insertions, 18 deletions

diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c
index 91e54960a3..615c2f51fa 100644
--- a/gtk/voip_calls.c
+++ b/gtk/voip_calls.c
@@ -1556,8 +1556,6 @@ gboolean isSignal(gchar *signal, gchar *signalStr)
 */
 void mgcpCallerID(gchar *signalStr, gchar **callerId)
 {
-	gint i; 
-	gchar **resultArray;
 	gchar **arrayStr;
 	
 	/* if there is no signalStr, just return false */
@@ -1568,24 +1566,12 @@ void mgcpCallerID(gchar *signalStr, gchar **callerId)
 	if (arrayStr[0] == NULL) return;
 
 	/* look for the ci signal */
-	resultArray = g_strsplit(arrayStr[0], ",(", 10);
-
-	for (i = 0; resultArray[i]; i++) {
-		g_strstrip(resultArray[i]);
-		if (strcmp(resultArray[i], "ci") == 0){
-			if (arrayStr[1] != NULL){
-				/* free the previous "From" field of the call, and assign the new */
-				g_free(*callerId);
-				*callerId = g_strdup(arrayStr[1]);
-			}
-			g_strfreev(arrayStr);
-			g_strfreev(resultArray);
-			return;
-		}
+	if (g_strrstr(arrayStr[0], "ci(") && (arrayStr[1] != NULL) ) {
+		/* free the previous "From" field of the call, and assign the new */
+		g_free(*callerId);
+		*callerId = g_strdup(arrayStr[1]);
 	}
-
 	g_strfreev(arrayStr);
-	g_strfreev(resultArray);
 
 	return;
 }