[asterisk-commits] mmichelson: branch 1.6.0 r120287 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jun  4 09:13:23 2008
New Revision: 120287

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120287
Log:
Merged revisions 120286 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r120286 | mmichelson | 2008-06-04 09:12:45 -0500 (Wed, 04 Jun 2008) | 15 lines

Merged revisions 120285 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120285 | mmichelson | 2008-06-04 09:11:12 -0500 (Wed, 04 Jun 2008) | 7 lines

Tab completion when removing a member should give the member's interface,
not the name, since the interface is what is expected for the command.

(closes issue #12783)
Reported by: davevg


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=120287&r1=120286&r2=120287
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jun  4 09:13:23 2008
@@ -5894,7 +5894,7 @@
 			if (!strncasecmp(word, m->membername, wordlen) && ++which > state) {
 				char *tmp;
 				ao2_unlock(q);
-				tmp = m->membername;
+				tmp = m->interface;
 				ao2_ref(m, -1);
 				queue_unref(q);
 				return ast_strdup(tmp);