Merged revisions 290674 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Wed, 6 Oct 2010 21:23:29 +0000 (21:23 +0000)
committerDavid Vossel <dvossel@digium.com>
Wed, 6 Oct 2010 21:23:29 +0000 (21:23 +0000)
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!
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290677 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_gtalk.c

index 00f873a..011d21d 100644 (file)
@@ -1627,7 +1627,8 @@ static int gtalk_digit_end(struct ast_channel *chan, char digit, unsigned int du
 
 /* 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 @@ static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duratio
        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 @@ static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duratio
        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");