From 175b6b223a63873e19b5a3df7c9ac144189046fa Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 28 Mar 2012 18:44:51 -0500
Subject: [PATCH] FS-4049 working

---
 src/mod/endpoints/mod_sofia/sofia_presence.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 4b84d6a667..c553119360 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -2453,15 +2453,15 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 			from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Destination-Number"));
 			
 		} else {
-			from_id = switch_str_nil(switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Number"));
-			from_name = switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Name");
+			from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Caller-ID-Number"));
+			from_name = switch_event_get_header(helper->event, "Caller-Caller-ID-Name");
 
 			if (zstr(from_id)) {
-				from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Caller-ID-Number"));
+				from_id = switch_str_nil(switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Number"));
 			}
 
 			if (zstr(from_name)) {
-				from_name = switch_event_get_header(helper->event, "Caller-Caller-ID-Name");
+				from_name = switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Name");
 			}
 			
 		}
@@ -2583,6 +2583,7 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 						}
 						stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host);
 						stream.write_function(&stream, "</remote>\n");
+
 					} else if (!strcasecmp(proto, "queue")) {
 						stream.write_function(&stream, "<local>\n<identity display=\"queue\">sip:%s@%s;proto=queue</identity>\n",
 											  !zstr(clean_to_user) ? clean_to_user : "unknown", host);