[svn-commits] dvossel: trunk r290677 - in /trunk: ./ channels/chan_gtalk.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Oct  6 16:23:29 2010
New Revision: 290677

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290677
Log:
Merged revisions 290674 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r290674 | dvossel | 2010-10-06 16:22:51 -0500 (Wed, 06 Oct 2010) | 4 lines
  
  Fixes commented out code to use #if 0 instead.
  
  Thanks to rmudgett for catching this!
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=290677&r1=290676&r2=290677
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Wed Oct  6 16:23:29 2010
@@ -1627,7 +1627,8 @@
 
 /* This function is of not in use at the moment, but I am choosing to leave this
  * within the code base as a reference to how DTMF is possible through
- * jingle signaling.  However, google currently does DTMF through the RTP. 
+ * jingle signaling.  However, google currently does DTMF through the RTP. */
+#if 0
 static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duration)
 {
 	struct gtalk_pvt *p = ast->tech_pvt;
@@ -1653,8 +1654,8 @@
 	ast_aji_increment_mid(client->connection->mid);
 	iks_insert_attrib(gtalk, "xmlns", "http://jabber.org/protocol/gtalk");
 	iks_insert_attrib(gtalk, "action", "session-info");
-	// put the initiator attribute to lower case if we receive the call
-	// otherwise GoogleTalk won't establish the session
+	/* put the initiator attribute to lower case if we receive the call
+	 * otherwise GoogleTalk won't establish the session */
 	if (!p->initiator) {
 	        char c;
 	        char *t = lowerthem = ast_strdupa(p->them);
@@ -1681,7 +1682,8 @@
 	ast_mutex_unlock(&p->lock);
 	return 0;
 }
-*/
+#endif
+
 static int gtalk_sendhtml(struct ast_channel *ast, int subclass, const char *data, int datalen)
 {
 	ast_log(LOG_NOTICE, "XXX Implement gtalk sendhtml XXX\n");