[SCM] kopete packaging branch, master, updated. debian/16.08.1-2-1-gc22304a

[Scott Kitterman]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kopete.git;a=commitdiff;h=c22304a

The following commit has been merged in the master branch:
commit c22304a1be1bdef7db8513eeabf0083e838418db
Author: Scott Kitterman <scott at kitterman.com>
Date:   Fri Jan 13 09:24:53 2017 -0500

    * Add debian/patches/fix_otr.patch from upstream to resolve issue with
      unencrypted messages being sent without notice (Closes: #827048)
---
 debian/changelog             |  8 ++++++++
 debian/patches/fix_otr.patch | 23 +++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e10fe04..56313d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kopete (4:16.08.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add debian/patches/fix_otr.patch from upstream to resolve issue with
+    unencrypted messages being sent without notice (Closes: #827048)
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 13 Jan 2017 09:00:46 -0500
+
 kopete (4:16.08.1-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_otr.patch b/debian/patches/fix_otr.patch
new file mode 100644
index 0000000..12e537e
--- /dev/null
+++ b/debian/patches/fix_otr.patch
@@ -0,0 +1,23 @@
+Description: Fix invisible OTR status changes
+   * Add debian/patches/fix_otr.patch from upstream to resolve issue with
+     unencrypted messages being sent without notice (Closes: #827048)
+Author: Scott Kitterman <scott at kitterman.com>
+Bug-Debian: http://bugs.debian.org/827048
+Origin: upstream
+Bug: https://bugs.kde.org/show_bug.cgi?id=362535
+Forwarded: not-needed
+Last-Update: 2017-01-13
+
+--- kopete-16.08.1.orig/plugins/otr/otrlchatinterface.cpp
++++ kopete-16.08.1/plugins/otr/otrlchatinterface.cpp
+@@ -744,6 +744,10 @@ int OtrlChatInterface::privState( Kopete
+ 	ConnContext *context = otrl_context_find(userstate, session->members().first()->contactId().toLocal8Bit(), session->account()->accountId().toLocal8Bit(), session->account()->protocol()->displayName().toLocal8Bit(), instance, 0, NULL, NULL, NULL);
+ 
+ 	if( context ){
++		if( instance == OTRL_INSTAG_BEST && context->their_instance ){
++			kDebug(14318) << "Updating otr-instag to" << context->their_instance << "for session" << session;
++			session->setProperty("otr-instag", QString::number(context->their_instance));
++		}
+ 		switch( context->msgstate ){
+ 		case OTRL_MSGSTATE_PLAINTEXT:
+ 			return 0;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e96aa61
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_otr.patch

-- 
kopete packaging