[pkg-otr-team] [irssi-plugin-otr] 105/167: Fixed an issue that happened when enabling pidgin-otr while a conversation is open.

[Holger Levsen]

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

holger pushed a commit to tag 4.0.0
in repository irssi-plugin-otr.

commit 7eb5e41e06c73ee72310f3e604ac0435784e90f0
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Wed Jun 20 16:23:26 2012 -0400

    Fixed an issue that happened when enabling pidgin-otr while a conversation is open.
---
 ChangeLog                        | 6 ++++++
 Makefile.mingw                   | 2 +-
 NEWS                             | 6 ++++++
 configure.ac                     | 2 +-
 gtk-dialog.c                     | 8 ++++----
 otr-plugin.c                     | 4 ++--
 packaging/windows/pidgin-otr.nsi | 2 +-
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d63eec9..75ee7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-21
+
+	* otr-plugin.c: Fixed an issue that happened when
+	enabling the OTR plugin while a conversation is open.
+	* Release 4.0.0-beta2
+
 2012-06-07
 
 	* Release 4.0.0-beta1
diff --git a/Makefile.mingw b/Makefile.mingw
index 5383af6..d8d9004 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,7 +1,7 @@
 WIN32=1
 
 # The version number to put in the plugin info
-PIDGIN_OTR_VERSION = 4.0.0-beta1
+PIDGIN_OTR_VERSION = 4.0.0-beta2
 
 # Name of the gettext domain
 GETTEXT_PACKAGE = pidgin-otr
diff --git a/NEWS b/NEWS
index 35a166e..66029fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+21 Jun 2012:
+
+- Fixed an issue that happened when enabling the OTR plugin while a
+  conversation is open.
+- Release 4.0.0-beta2
+
 7 Jun 2012:
 
 - The plugin now supports multiple OTR conversations with the same
diff --git a/configure.ac b/configure.ac
index 4ca6c26..2c5c392 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce configure.
 
-AC_INIT(pidgin-otr, 4.0.0-beta1)
+AC_INIT(pidgin-otr, 4.0.0-beta2)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 9d93775..5a78984 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -3133,8 +3133,8 @@ static gboolean check_incoming_instance_change(PurpleAccount *account,
     last_received_instance = g_hash_table_lookup(conv->data,
 	    "otr-last_received_ctx");
 
-    if ((*last_received_instance == OTRL_INSTAG_MASTER || 
-	    *last_received_instance >= OTRL_MIN_VALID_INSTAG)) {
+    if (*last_received_instance == OTRL_INSTAG_MASTER || 
+	    *last_received_instance >= OTRL_MIN_VALID_INSTAG) {
 	have_received = TRUE;
     }
 
@@ -3235,8 +3235,8 @@ static void otrg_gtk_dialog_cleanup(void)
 	    PURPLE_CALLBACK(conversation_switched));
 
     purple_signal_disconnect(pidgin_conversations_get_handle(),
-	"conversation-timestamp", otrg_plugin_handle,
-	PURPLE_CALLBACK(conversation_timestamp));
+	    "conversation-timestamp", otrg_plugin_handle,
+	    PURPLE_CALLBACK(conversation_timestamp));
 
     purple_signal_disconnect(purple_conversations_get_handle(),
 	    "deleting-conversation", otrg_plugin_handle,
diff --git a/otr-plugin.c b/otr-plugin.c
index b2f58f1..524110a 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -869,7 +869,7 @@ ConnContext* otrg_plugin_conv_to_selected_context(PurpleConversation *conv,
     return otrg_plugin_conv_to_context(conv, selected_instance, force_create);
 }
 
-static void process_conv_create(PurpleConversation *conv, void *data)
+static void process_conv_create(PurpleConversation *conv)
 {
     otrl_instag_t * selected_instance;
     OtrlMessageEvent * msg_event;
@@ -1285,7 +1285,7 @@ static gboolean otr_plugin_load(PurplePlugin *handle)
     otrg_ui_init();
     otrg_dialog_init();
 
-    purple_conversation_foreach(otrg_dialog_new_conv);
+    purple_conversation_foreach(process_conv_create);
 
     return 1;
 }
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index d8f7d75..7440d88 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -26,7 +26,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "pidgin-otr"
-!define PRODUCT_VERSION "4.0.0-0-beta1"
+!define PRODUCT_VERSION "4.0.0-0-beta2"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://otr.cypherpunks.ca/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-otr/packages/irssi-plugin-otr.git