tidy up, note yesterday's propagate_vars was changed to export_vars

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3106 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/libdingaling/src/libdingaling.c

@@ -1698,7 +1698,7 @@ char *ldl_handle_probe(ldl_handle_t *handle, char *id, char *from, char *buf, un
 		elapsed = (unsigned int)((apr_time_now() - started) / 1000);
 		if (elapsed > 5000 && ! again) {
 			msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); 
-			iks_insert_attrib(pres, "from", from);
+			iks_insert_attrib(msg, "from", from);
 			apr_queue_push(handle->queue, msg);
 			again++;
 		}

src/include/switch_sqlite.h

@@ -1706,6 +1706,7 @@ DoxyDefine(int switch_core_db_value_type(sqlite3_value*);)
  */
 DoxyDefine(char *switch_core_db_mprintf(const char*,...);)
 #define switch_core_db_mprintf sqlite3_mprintf
+#define switch_mprintf sqlite3_mprintf
 
 /**
  * This routine is a variant of the "sprintf()" from the

src/mod/endpoints/mod_dingaling/mod_dingaling.c

@@ -2127,14 +2127,17 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
 							if (!strcmp(exten, "_auto_")) {
 								if ((t = ldl_session_get_callee(dlsession))) {
 									if ((them = strdup(t))) {
-										char *p;
+										char *a, *b, *p;
 										if ((p = strchr(them, '/'))) {
 											*p = '\0';
 										}
+
+										if ((a = strchr(them, '+')) && (b = strrchr(them, '+')) && a != b) {
+											*b = '@';
+										}
 										exten = them;
 									}
 								}
-								
 							}
 						}
 			

src/switch_core.c

@@ -1375,10 +1375,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_outgoing_channel(switch_core
 		}
 
 		if (channel && peer_channel) {
-			char *propagate_vars;
+			char *export_vars;
 			/* A comma (,) separated list of variable names that should ne propagated from originator to originatee */
-			if ((propagate_vars = switch_channel_get_variable(channel, "propagate_vars"))) {
-				char *cptmp = switch_core_session_strdup(session, propagate_vars);
+			if ((export_vars = switch_channel_get_variable(channel, "export_vars"))) {
+				char *cptmp = switch_core_session_strdup(session, export_vars);
 				int argc;
 				char *argv[256];