[asterisk-commits] kmoore: branch kmoore/stasis-mwi r382472 - /team/kmoore/stasis-mwi/res/

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Mar  5 15:15:55 2013
New Revision: 382472

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382472
Log:
Fix res_jabber now that I'm compiling it again

Modified:
    team/kmoore/stasis-mwi/res/res_jabber.c

Modified: team/kmoore/stasis-mwi/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-mwi/res/res_jabber.c?view=diff&rev=382472&r1=382471&r2=382472
==============================================================================
--- team/kmoore/stasis-mwi/res/res_jabber.c (original)
+++ team/kmoore/stasis-mwi/res/res_jabber.c Tue Mar  5 15:15:55 2013
@@ -373,7 +373,7 @@
 static void aji_publish_mwi(struct aji_client *client, const char *mailbox,
 	const char *context, const char *oldmsgs, const char *newmsgs);
 static void aji_devstate_cb(const struct ast_event *ast_event, void *data);
-static void aji_mwi_cb(void *data, struct stasis_topic *topic, struct stasis_message *msg);
+static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg);
 static iks* aji_build_publish_skeleton(struct aji_client *client, const char *node,
 				       const char *event_type, unsigned int cachable);
 /* No transports in this version */
@@ -3368,12 +3368,11 @@
 			return IKS_FILTER_EAT;
 		}
 	} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
-		char *uniqueid = ast_strdupa(item_id);
 		context = strsep(&item_id, "@");
 		sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
 		sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
 
-		stasis_publish_mwi_state_full(uniqueid, item_id, context, newmsgs, oldmsgs, &pubsub_eid);
+		stasis_publish_mwi_state_full(item_id, context, newmsgs, oldmsgs, &pubsub_eid);
 
 		return IKS_FILTER_EAT;
 	} else {