[svn-commits] mvanbaak: branch mvanbaak/ast_frame_dataunion r117796 - in /team/mvanbaak/ast...

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Thu May 22 11:12:36 2008
New Revision: 117796

URL: http://svn.digium.com/view/asterisk?view=rev&rev=117796
Log:
Merged revisions 117792,117794 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r117792 | seanbright | 2008-05-22 17:49:17 +0200 (Thu, 22 May 2008) | 1 line

Minor text fix.  roster -> resource.
........
r117794 | mmichelson | 2008-05-22 18:05:18 +0200 (Thu, 22 May 2008) | 3 lines

Committing a fix pointed out by Atis Lezdins on the asterisk-dev list. Thanks!


........

Modified:
    team/mvanbaak/ast_frame_dataunion/   (props changed)
    team/mvanbaak/ast_frame_dataunion/apps/app_queue.c
    team/mvanbaak/ast_frame_dataunion/configs/jabber.conf.sample

Propchange: team/mvanbaak/ast_frame_dataunion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 22 11:12:36 2008
@@ -1,1 +1,1 @@
-/trunk:1-117771
+/trunk:1-117795

Modified: team/mvanbaak/ast_frame_dataunion/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/apps/app_queue.c?view=diff&rev=117796&r1=117795&r2=117796
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/apps/app_queue.c (original)
+++ team/mvanbaak/ast_frame_dataunion/apps/app_queue.c Thu May 22 11:12:36 2008
@@ -3944,12 +3944,15 @@
 				ao2_ref(mem, -1);
 			}
 		}
+		
+		if (!ast_strlen_zero(queuename) && !strcasecmp(queuename, q->name)) {
+			ao2_unlock(q);
+			queue_unref(q);
+			break;
+		}
+		
 		ao2_unlock(q);
 		queue_unref(q);
-		
-		if (!ast_strlen_zero(queuename) && found) {
-			break;
-		}
 	}
 
 	return found ? RESULT_SUCCESS : RESULT_FAILURE;

Modified: team/mvanbaak/ast_frame_dataunion/configs/jabber.conf.sample
URL: http://svn.digium.com/view/asterisk/team/mvanbaak/ast_frame_dataunion/configs/jabber.conf.sample?view=diff&rev=117796&r1=117795&r2=117796
==============================================================================
--- team/mvanbaak/ast_frame_dataunion/configs/jabber.conf.sample (original)
+++ team/mvanbaak/ast_frame_dataunion/configs/jabber.conf.sample Thu May 22 11:12:36 2008
@@ -7,7 +7,7 @@
 ;type=client				;;Client or Component connection
 ;serverhost=astjab.org			;;Route to server for example,
 					;;	talk.google.com
-;username=asterisk at astjab.org/asterisk	;;Username with optional roster.
+;username=asterisk at astjab.org/asterisk	;;Username with optional resource.
 ;secret=blah				;;Password
 ;priority=1				;;Resource priority
 ;port=5222				;;Port to use defaults to 5222