Commit df744439 authored by Ian Goldberg's avatar Ian Goldberg
Browse files

Merge remote branch 'origin/4.0.0-beta2'

Conflicts:
	ChangeLog
parents d198e3f4 7eb5e41e
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-20
* po/el.po: Greek translation by <irregulator@riseup.net>
......
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
......
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
......
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)
......
......@@ -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,
......
......@@ -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;
}
......
......@@ -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}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment