From: Jeremy McNamara <jj@nufone.net>
Date: Thu, 24 Jul 2003 17:24:34 +0000 (+0000)
Subject: rollback the last changes. wrong direction
X-Git-Tag: 0.5.0~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b7e57f8b8550fff7c2cb747770d3d136806642d;p=thirdparty%2Fasterisk.git

rollback the last changes. wrong direction


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c
index 8804ac51d5..017a164361 100755
--- a/channels/h323/chan_h323.c
+++ b/channels/h323/chan_h323.c
@@ -963,11 +963,7 @@ int setup_incoming_call(call_details_t cd)
 			strncpy(p->context, alias->context, sizeof(p->context)-1);
 		}
 
-		if (!strlen(p->cd.call_source_aliases)) 
-			sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164); 
-		else
-			sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
-
+		sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
 
 	} else { 
 		/* Either this call is not from the Gatekeeper 
@@ -976,10 +972,7 @@ int setup_incoming_call(call_details_t cd)
 		user  = find_user(cd.call_source_aliases);
 		
 		if (!user) {
-			if (!strlen(p->cd.call_source_aliases)) 
-				sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164); 
-			else
-				sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
+			sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
 			if (strlen(p->cd.call_dest_e164)) {
 				strncpy(p->exten, cd.call_dest_e164, sizeof(p->exten)-1);
 			} else {
@@ -1016,11 +1009,8 @@ int setup_incoming_call(call_details_t cd)
 			if (strlen(user->callerid)) 
 				strncpy(p->callerid, user->callerid, sizeof(p->callerid) - 1);
 			else
-				if (!strlen(p->cd.call_source_aliases)) 
-					sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164); 
-				else
-					sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
-
+				sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
+	
 			if (strlen(p->cd.call_dest_e164)) {
 				strncpy(p->exten, cd.call_dest_e164, sizeof(p->exten)-1);
 			} else {