[asterisk-commits] kmoore: branch kmoore/stasis-device_state r383288 - in /team/kmoore/stasis-de...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Sat Mar 16 11:01:13 2013
New Revision: 383288

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383288
Log:
Make sure things compile...
........

Merged revisions 383287 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/kmoore/stasis-device_state/   (props changed)
    team/kmoore/stasis-device_state/channels/chan_mgcp.c
    team/kmoore/stasis-device_state/res/res_jabber.c

Propchange: team/kmoore/stasis-device_state/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Mar 16 11:01:13 2013
@@ -1,1 +1,1 @@
-/trunk:1-383284
+/trunk:1-383287

Modified: team/kmoore/stasis-device_state/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/channels/chan_mgcp.c?view=diff&rev=383288&r1=383287&r2=383288
==============================================================================
--- team/kmoore/stasis-device_state/channels/chan_mgcp.c (original)
+++ team/kmoore/stasis-device_state/channels/chan_mgcp.c Sat Mar 16 11:01:13 2013
@@ -507,7 +507,7 @@
 
 	ast_str_set(&uniqueid, 0, "%s@%s", mbox, cntx);
 
-	msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state(), ast_str_buffer(uniqueid));
+	msg = stasis_cache_get(stasis_mwi_topic_cached(), stasis_mwi_state_message(), ast_str_buffer(uniqueid));
 
 	if (msg) {
 		struct stasis_mwi_state *mwi_state = stasis_message_data(msg);
@@ -4182,7 +4182,7 @@
 					ast_str_reset(uniqueid);
 					ast_str_set(&uniqueid, 0, "%s@%s", mbox, cntx);
 
-					maibox_specific_topic = stasis_mwi_topic(ast_str_buffer(uniqueid));
+					mailbox_specific_topic = stasis_mwi_topic(ast_str_buffer(uniqueid));
 					if (mailbox_specific_topic) {
 						e->mwi_event_sub = stasis_subscribe(mailbox_specific_topic, mwi_event_cb, NULL);
 					}

Modified: team/kmoore/stasis-device_state/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/res/res_jabber.c?view=diff&rev=383288&r1=383287&r2=383288
==============================================================================
--- team/kmoore/stasis-device_state/res/res_jabber.c (original)
+++ team/kmoore/stasis-device_state/res/res_jabber.c Sat Mar 16 11:01:13 2013
@@ -3249,7 +3249,7 @@
 	struct aji_client *client = data;
 	struct stasis_mwi_state *mwi_state;
 
-	if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state() != stasis_message_type(msg)) {
+	if (!stasis_subscription_is_subscribed(sub) || stasis_mwi_state_message() != stasis_message_type(msg)) {
 		return;
 	}