Commit 263c9381 authored by Ian Goldberg's avatar Ian Goldberg
Browse files

Correct the last call to dialog_update_label_conv

If one of our buddies is/her side of the OTR session, don't
automatically change bel on the OTR button on our side to "Finished",
since may be other sessions for the same buddy still in ENCRYPTED.
This was the last call to dialog_update_label_conv that still had a
hardcoded trust label set, rather than using
otrg_plugin_context_to_trust to get the trust label corresponding to the
currently selected instance.
parent 18dd7d98
......@@ -3,6 +3,11 @@
* otr-plugin.c: Add a timer_control callback for the last-minute
libotr 4 API change.
* gtk-dialog.c (otrg_gtk_dialog_finished): If one of our buddies
ends his/her side of the OTR session, don't automatically change
the label on the OTR button on our side to "Finished", since
there may be other sessions for the same buddy still in ENCRYPTED.
2012-08-24
* otr-plugin.c: Turn off the beta dialog
......
......@@ -1627,6 +1627,7 @@ static void otrg_gtk_dialog_finished(const char *accountname,
/* See if there's a conversation window we can put this in. */
PurpleAccount *account;
PurpleConversation *conv;
ConnContext *context;
char *buf;
account = purple_accounts_find(accountname, protocol);
......@@ -1645,7 +1646,8 @@ static void otrg_gtk_dialog_finished(const char *accountname,
g_free(buf);
dialog_update_label_conv(conv, TRUST_FINISHED);
context = otrg_plugin_conv_to_selected_context(conv, 0);
dialog_update_label_conv(conv, otrg_plugin_context_to_trust(context));
close_smp_window(conv);
}
......
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