[Pkg-privacy-commits] [libotr] 74/225: Put new child contexts in the right order in the context list

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository libotr.

commit c8e9f097114102e85a9be1eaeacc1053338e7fbb
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Wed Jun 13 12:26:12 2012 -0400

    Put new child contexts in the right order in the context list
---
 src/context.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/context.c b/src/context.c
index 62625df..43a4b0c 100644
--- a/src/context.c
+++ b/src/context.c
@@ -176,9 +176,10 @@ ConnContext * otrl_context_find(OtrlUserState us, const char *user,
 		(usercmp == 0 &&
 		(acctcmp = strcmp((*curp)->accountname, accountname)) > 0) ||
 		(usercmp == 0 && acctcmp == 0 &&
-		(protocmp = strcmp((*curp)->protocol, protocol)) >= 0)
+		(protocmp = strcmp((*curp)->protocol, protocol)) >= 0) ||
+		(usercmp == 0 && acctcmp == 0 && protocmp == 0
 		&& (their_instance < OTRL_MIN_VALID_INSTAG || 
-		(their_instance == (*curp)->their_instance)))
+		    (their_instance == (*curp)->their_instance))))
 	    /* We're at the right place in the list.  We've either found
 	     * it, or gone too far. */
 	    break;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libotr.git