[asterisk-commits] dvossel: branch dvossel/gtalk_fixup r290826 - in /team/dvossel/gtalk_fixup: ....

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Oct 7 16:39:11 CDT 2010 

Author: dvossel
Date: Thu Oct  7 16:39:09 2010
New Revision: 290826

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=290826
Log:
svn merge

Modified:
    team/dvossel/gtalk_fixup/   (props changed)
    team/dvossel/gtalk_fixup/autoconf/ast_ext_lib.m4
    team/dvossel/gtalk_fixup/channels/chan_gtalk.c
    team/dvossel/gtalk_fixup/configure
    team/dvossel/gtalk_fixup/include/asterisk/autoconfig.h.in
    team/dvossel/gtalk_fixup/main/pbx.c

Propchange: team/dvossel/gtalk_fixup/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Propchange: team/dvossel/gtalk_fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct  7 16:39:09 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-290615
+/branches/1.8:1-290820

Modified: team/dvossel/gtalk_fixup/autoconf/ast_ext_lib.m4
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/autoconf/ast_ext_lib.m4?view=diff&rev=290826&r1=290825&r2=290826
==============================================================================
--- team/dvossel/gtalk_fixup/autoconf/ast_ext_lib.m4 (original)
+++ team/dvossel/gtalk_fixup/autoconf/ast_ext_lib.m4 Thu Oct  7 16:39:09 2010
@@ -71,6 +71,7 @@
       break
    fi
 done
+$1_DIR=${$3_DIR}
 ])
 PBX_$1=0
 AH_TEMPLATE(m4_bpatsubst([[HAVE_$1]], [(.*)]), [Define to 1 if you have the $2 library.])

Modified: team/dvossel/gtalk_fixup/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/channels/chan_gtalk.c?view=diff&rev=290826&r1=290825&r2=290826
==============================================================================
--- team/dvossel/gtalk_fixup/channels/chan_gtalk.c (original)
+++ team/dvossel/gtalk_fixup/channels/chan_gtalk.c Thu Oct  7 16:39:09 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;
@@ -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");

Modified: team/dvossel/gtalk_fixup/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/include/asterisk/autoconfig.h.in?view=diff&rev=290826&r1=290825&r2=290826
==============================================================================
--- team/dvossel/gtalk_fixup/include/asterisk/autoconfig.h.in (original)
+++ team/dvossel/gtalk_fixup/include/asterisk/autoconfig.h.in Thu Oct  7 16:39:09 2010
@@ -813,7 +813,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
 /* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1088,11 +1088,11 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
@@ -1112,11 +1112,6 @@
 
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
 
 /* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
@@ -1153,23 +1148,33 @@
 /* Define to a type of the same size as fd_set.fds_bits[[0]] */
 #undef TYPEOF_FD_SET_FDS_BITS
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Define to 1 if running on Darwin. */
-#undef _DARWIN_UNLIMITED_SELECT
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if running on Darwin. */
+#undef _DARWIN_UNLIMITED_SELECT
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
 
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@@ -1186,20 +1191,6 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: team/dvossel/gtalk_fixup/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/gtalk_fixup/main/pbx.c?view=diff&rev=290826&r1=290825&r2=290826
==============================================================================
--- team/dvossel/gtalk_fixup/main/pbx.c (original)
+++ team/dvossel/gtalk_fixup/main/pbx.c Thu Oct  7 16:39:09 2010
@@ -9550,11 +9550,18 @@
 	mydata = ast_strdupa(data);
 	name = strsep(&mydata, "=");
 	value = mydata;
-	if (strchr(name, ' '))
+	if (!value) {
+		ast_log(LOG_WARNING, "Set requires an '=' to be a valid assignment.\n");
+		return 0;
+	}
+
+	if (strchr(name, ' ')) {
 		ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", name, mydata);
+	}
 
 	pbx_builtin_setvar_helper(chan, name, value);
-	return(0);
+
+	return 0;
 }
 
 int pbx_builtin_setvar_multiple(struct ast_channel *chan, const char *vdata)

More information about the asterisk-commits mailing list