From: George Joseph <gjoseph@digium.com>
Date: Tue, 31 May 2016 00:27:35 +0000 (-0600)
Subject: res_pjsip_mwi_body_generator:  Re-order the body items
X-Git-Tag: 13.10.0-rc1~54^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe305ccf01003e9484098ee5e8319e847a1cecc7;p=thirdparty%2Fasterisk.git

res_pjsip_mwi_body_generator:  Re-order the body items

Re-ordered the body items so Message-Account is second.

Messages-Waiting: no
Message-Account: sip:1571@<IP Removed>:5060
Voice-Message: 0/0 (0/0)

ASTERISK-26065 #close
Reported-by: Ross Beer

Change-Id: If5d35a64656eac98c2dd5e490cc0b2807bed80c3
---

diff --git a/res/res_pjsip_mwi_body_generator.c b/res/res_pjsip_mwi_body_generator.c
index f6aca2df11..54b0782122 100644
--- a/res/res_pjsip_mwi_body_generator.c
+++ b/res/res_pjsip_mwi_body_generator.c
@@ -61,11 +61,11 @@ static int mwi_generate_body_content(void *body, void *data)
 
 	ast_str_append(mwi, 0, "Messages-Waiting: %s\r\n",
 			counter->new_msgs ? "yes" : "no");
-	ast_str_append(mwi, 0, "Voice-Message: %d/%d (0/0)\r\n",
-			counter->new_msgs, counter->old_msgs);
 	if (!ast_strlen_zero(counter->message_account))  {
 		ast_str_append(mwi, 0, "Message-Account: %s\r\n", counter->message_account);
 	}
+	ast_str_append(mwi, 0, "Voice-Message: %d/%d (0/0)\r\n",
+			counter->new_msgs, counter->old_msgs);
 
 	return 0;
 }