[svn-commits] mmichelson: branch mmichelson/pubsub_bodies r405988 - in /team/mmichelson/pub...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Mon Jan 20 18:01:54 2014
New Revision: 405988

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405988
Log:
Add ast_sip_ prefix to message accumulator for MWI.


Modified:
    team/mmichelson/pubsub_bodies/include/asterisk/res_pjsip_body_generator_types.h
    team/mmichelson/pubsub_bodies/res/res_pjsip_mwi.c
    team/mmichelson/pubsub_bodies/res/res_pjsip_mwi_body_generator.c

Modified: team/mmichelson/pubsub_bodies/include/asterisk/res_pjsip_body_generator_types.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/pubsub_bodies/include/asterisk/res_pjsip_body_generator_types.h?view=diff&rev=405988&r1=405987&r2=405988
==============================================================================
--- team/mmichelson/pubsub_bodies/include/asterisk/res_pjsip_body_generator_types.h (original)
+++ team/mmichelson/pubsub_bodies/include/asterisk/res_pjsip_body_generator_types.h Mon Jan 20 18:01:54 2014
@@ -51,7 +51,7 @@
  *
  * This is used for application/simple-message-summary bodies.
  */
-struct message_accumulator {
+struct ast_sip_message_accumulator {
 	/*! Number of old messages */
 	int old_msgs;
 	/*! Number of new messages */

Modified: team/mmichelson/pubsub_bodies/res/res_pjsip_mwi.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/pubsub_bodies/res/res_pjsip_mwi.c?view=diff&rev=405988&r1=405987&r2=405988
==============================================================================
--- team/mmichelson/pubsub_bodies/res/res_pjsip_mwi.c (original)
+++ team/mmichelson/pubsub_bodies/res/res_pjsip_mwi.c Mon Jan 20 18:01:54 2014
@@ -232,7 +232,7 @@
 {
 	RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
 	struct mwi_stasis_subscription *mwi_stasis = obj;
-	struct message_accumulator *counter = arg;
+	struct ast_sip_message_accumulator *counter = arg;
 	struct ast_mwi_state *mwi_state;
 
 	msg = stasis_cache_get(ast_mwi_state_cache(), ast_mwi_state_type(), mwi_stasis->mailbox);
@@ -365,7 +365,7 @@
 static void send_mwi_notify(struct mwi_subscription *sub, pjsip_evsub_state state, const char *reason)
 {
 	const pj_str_t *reason_str_ptr = NULL;
-	struct message_accumulator counter = {
+	struct ast_sip_message_accumulator counter = {
 		.old_msgs = 0,
 		.new_msgs = 0,
 	};

Modified: team/mmichelson/pubsub_bodies/res/res_pjsip_mwi_body_generator.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/pubsub_bodies/res/res_pjsip_mwi_body_generator.c?view=diff&rev=405988&r1=405987&r2=405988
==============================================================================
--- team/mmichelson/pubsub_bodies/res/res_pjsip_mwi_body_generator.c (original)
+++ team/mmichelson/pubsub_bodies/res/res_pjsip_mwi_body_generator.c Mon Jan 20 18:01:54 2014
@@ -57,7 +57,7 @@
 static int mwi_generate_body_content(void *body, void *data)
 {
 	struct ast_str **mwi = body;
-	struct message_accumulator *counter = data;
+	struct ast_sip_message_accumulator *counter = data;
 
 	ast_str_append(mwi, 0, "Messages-Waiting: %s\r\n",
 			counter->new_msgs ? "yes" : "no");