[Pkg-privacy-commits] [libotr] 77/225: context_find_recent_secure_instance now prefers finished over not private. Preparing for 4.0.0-beta2.

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 12:44:58 UTC 2015


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

infinity0 pushed a commit to branch master
in repository libotr.

commit bfabc73453332883766e9d065ffbf2c1d2b9c7f2
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Wed Jun 20 16:19:44 2012 -0400

    context_find_recent_secure_instance now prefers finished over not private.
    Preparing for 4.0.0-beta2.
---
 ChangeLog     | 5 +++++
 configure.ac  | 2 +-
 src/context.c | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b4ecb5..f12ce68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-21
+
+	* src/context.c: A couple bug fixes.
+	* Release 4.0.0-beta2
+
 2012-06-07
 
 	* Release 4.0.0-beta1
diff --git a/configure.ac b/configure.ac
index 57bd9f3..54d7ab0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl   For a backwards-incompatible API change (e.g. changing data structures):
 dnl     Change the libotr package version from a.b.c to (a+1).0.0
 dnl     Change the libotr libtool version from x:y:z to (x+1):0:0
 
-AM_INIT_AUTOMAKE(libotr, 4.0.0-beta1)
+AM_INIT_AUTOMAKE(libotr, 4.0.0-beta2)
 LIBOTR_LIBTOOL_VERSION="5:0:0"
 
 AC_SUBST(LIBOTR_LIBTOOL_VERSION)
diff --git a/src/context.c b/src/context.c
index 180c0b3..d88c36a 100644
--- a/src/context.c
+++ b/src/context.c
@@ -123,7 +123,9 @@ ConnContext * otrl_context_find_recent_secure_instance(ConnContext * context)
 
 	if (cresult->msgstate == curp->msgstate) {
 	    msgstate_improved = 0;
-	} else if (curp->msgstate == OTRL_MSGSTATE_ENCRYPTED) {
+	} else if (curp->msgstate == OTRL_MSGSTATE_ENCRYPTED ||
+		(cresult->msgstate == OTRL_MSGSTATE_PLAINTEXT &&
+		curp->msgstate == OTRL_MSGSTATE_FINISHED)) {
 	    msgstate_improved = 1;
 	} else {
 	    continue;

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



More information about the Pkg-privacy-commits mailing list