[svn-commits] irroot: branch irroot/distrotech-customers-trunk r322324 - in /team/irroot/di...

[SVN commits to the Digium repositories]

Author: irroot
Date: Wed Jun  8 01:57:31 2011
New Revision: 322324

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=322324
Log:
Conflict Resolved Auto Merge On

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/channels/chan_sip.c
    team/irroot/distrotech-customers-trunk/configs/sip_notify.conf.sample
    team/irroot/distrotech-customers-trunk/include/asterisk/message.h
    team/irroot/distrotech-customers-trunk/res/res_jabber.c

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  8 01:57:31 2011
@@ -1,1 +1,1 @@
-/trunk:1-322170
+/trunk:1-322323

Modified: team/irroot/distrotech-customers-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/channels/chan_sip.c?view=diff&rev=322324&r1=322323&r2=322324
==============================================================================
--- team/irroot/distrotech-customers-trunk/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-trunk/channels/chan_sip.c Wed Jun  8 01:57:31 2011
@@ -7436,7 +7436,7 @@
 		p->peercaps = ast_format_cap_destroy(p->peercaps);
 		p->redircaps = ast_format_cap_destroy(p->redircaps);
 		p->prefcaps = ast_format_cap_destroy(p->prefcaps);
-		ao2_t_ref(p, -1, "Yuck, couldn't allocate cc_params struct. Get rid o' p");
+		ao2_t_ref(p, -1, "Yuck, couldn't allocate format capabilities. Get rid o' p");
 		return NULL;
 	}
 

Modified: team/irroot/distrotech-customers-trunk/configs/sip_notify.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/configs/sip_notify.conf.sample?view=diff&rev=322324&r1=322323&r2=322324
==============================================================================
--- team/irroot/distrotech-customers-trunk/configs/sip_notify.conf.sample (original)
+++ team/irroot/distrotech-customers-trunk/configs/sip_notify.conf.sample Wed Jun  8 01:57:31 2011
@@ -44,7 +44,7 @@
 Event=>check-sync\;reboot=false
 
 [snom-reboot]
-Event=>reboot
+Event=>check-sync\;reboot=true
 
 ; Cisco
 

Modified: team/irroot/distrotech-customers-trunk/include/asterisk/message.h
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/include/asterisk/message.h?view=diff&rev=322324&r1=322323&r2=322324
==============================================================================
--- team/irroot/distrotech-customers-trunk/include/asterisk/message.h (original)
+++ team/irroot/distrotech-customers-trunk/include/asterisk/message.h Wed Jun  8 01:57:31 2011
@@ -49,17 +49,17 @@
  * A message technology is capable of transmitting text messages.
  */
 struct ast_msg_tech {
-        /*!
-         * \brief Name of this message technology
-         *
-         * This is the name that comes at the beginning of a URI for messages
-         * that should be sent to this message technology implementation.
-         * For example, messages sent to "xmpp:rbryant at digium.com" would be
-         * passed to the ast_msg_tech with a name of "xmpp".
-         */
-        const char * const name;
-        /*!
-         * \brief Send a message.
+	/*!
+	 * \brief Name of this message technology
+	 *
+	 * This is the name that comes at the beginning of a URI for messages
+	 * that should be sent to this message technology implementation.
+	 * For example, messages sent to "xmpp:rbryant at digium.com" would be
+	 * passed to the ast_msg_tech with a name of "xmpp".
+	 */
+	const char * const name;
+	/*!
+	 * \brief Send a message.
 	 *
 	 * \param msg the message to send
 	 * \param to the URI of where the message is being sent
@@ -70,8 +70,8 @@
 	 *
 	 * \retval 0 success
 	 * \retval non-zero failure
-         */
-        int (* const msg_send)(const struct ast_msg *msg, const char *to, const char *from);
+	 */
+	int (* const msg_send)(const struct ast_msg *msg, const char *to, const char *from);
 };
 
 /*!

Modified: team/irroot/distrotech-customers-trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/res/res_jabber.c?view=diff&rev=322324&r1=322323&r2=322324
==============================================================================
--- team/irroot/distrotech-customers-trunk/res/res_jabber.c (original)
+++ team/irroot/distrotech-customers-trunk/res/res_jabber.c Wed Jun  8 01:57:31 2011
@@ -2295,21 +2295,23 @@
 		ast_debug(3, "message comes from %s\n", insert->from);
 	}
 
-	if ((msg = ast_msg_alloc())) {
-		int res;
-
-		res = ast_msg_set_to(msg, "xmpp:%s", client->user);
-		res |= ast_msg_set_from(msg, "xmpp:%s", insert->from);
-		res |= ast_msg_set_body(msg, "%s", insert->message);
-		res |= ast_msg_set_context(msg, "%s", client->context);
-
-		if (res) {
-			ast_msg_destroy(msg);
-		} else {
-			ast_msg_queue(msg);
-		}
-
-		msg = NULL;
+	if (client->send_to_dialplan) {
+		if ((msg = ast_msg_alloc())) {
+			int res;
+
+			res = ast_msg_set_to(msg, "xmpp:%s", client->user);
+			res |= ast_msg_set_from(msg, "xmpp:%s", insert->from);
+			res |= ast_msg_set_body(msg, "%s", insert->message);
+			res |= ast_msg_set_context(msg, "%s", client->context);
+
+			if (res) {
+				ast_msg_destroy(msg);
+			} else {
+				ast_msg_queue(msg);
+			}
+
+			msg = NULL;
+		}
 	}
 
 	/* remove old messages received from this JID