[asterisk-commits] file: branch file/pjsip-outbound-publish r419936 - /team/file/pjsip-outbound-...

[SVN commits to the Asterisk project]

Author: file
Date: Sun Aug  3 17:57:09 2014
New Revision: 419936

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419936
Log:
Remove some old code and fix naming of a datastore.

Modified:
    team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c

Modified: team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c?view=diff&rev=419936&r1=419935&r2=419936
==============================================================================
--- team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c (original)
+++ team/file/pjsip-outbound-publish/res/res_pjsip_publish_asterisk.c Sun Aug  3 17:57:09 2014
@@ -84,8 +84,6 @@
 	struct ast_sip_outbound_publish_client *client;
 	/*! \brief Device state subscription */
 	struct stasis_subscription *device_state_subscription;
-	/*! \brief Send outbound device state events */
-	unsigned int device_state;
 	/*! \brief Regex used for filtering outbound device state */
 	regex_t device_state_regex;
 	/*! \brief Device state should be filtered */
@@ -98,8 +96,6 @@
 	struct ast_sip_outbound_publish_client *client;
 	/*! \brief Mailbox state subscription */
 	struct stasis_subscription *mailbox_state_subscription;
-	/*! \brief Send outbound mailbox events */
-	unsigned int mailbox_state;
 	/*! \brief Regex used for filtering outbound mailbox state */
 	regex_t mailbox_state_regex;
 	/*! \brief Mailbox state should be filtered */
@@ -359,7 +355,7 @@
 	publisher_state->device_state_subscription = stasis_subscribe(ast_device_state_topic_all(),
 		asterisk_publisher_devstate_cb, ao2_bump(datastore));
 	if (!publisher_state->device_state_subscription) {
-		ast_sip_publish_client_remove_datastore(client, "asterisk-publisher");
+		ast_sip_publish_client_remove_datastore(client, "asterisk-devicestate-publisher");
 		return -1;
 	}