changeset 28417:e7bb163434c7

Show the message only for the chats for the account signing off.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 22 Oct 2009 01:21:25 +0000
parents 72472238ad45
children c3f79073c9be 8464e695c62b
files finch/gntconv.c pidgin/gtkconv.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/finch/gntconv.c	Thu Oct 22 01:19:22 2009 +0000
+++ b/finch/gntconv.c	Thu Oct 22 01:21:25 2009 +0000
@@ -371,12 +371,14 @@
 account_signing_off(PurpleConnection *gc)
 {
 	GList *list = purple_get_chats();
+	PurpleAccount *account = purple_connection_get_account(gc);
 
 	/* We are about to sign off. See which chats we are currently in, and mark
 	 * them for rejoin on reconnect. */
 	while (list) {
 		PurpleConversation *conv = list->data;
-		if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
+		if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)) &&
+				purple_conversation_get_account(conv) == account) {
 			purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE));
 			purple_conversation_write(conv, NULL, _("The account has disconnected and you are no "
 						"longer in this chat. You will be automatically rejoined in the chat when "
--- a/pidgin/gtkconv.c	Thu Oct 22 01:19:22 2009 +0000
+++ b/pidgin/gtkconv.c	Thu Oct 22 01:21:25 2009 +0000
@@ -7605,12 +7605,14 @@
 account_signing_off(PurpleConnection *gc)
 {
 	GList *list = purple_get_chats();
+	PurpleAccount *account = purple_connection_get_account(gc);
 
 	/* We are about to sign off. See which chats we are currently in, and mark
 	 * them for rejoin on reconnect. */
 	while (list) {
 		PurpleConversation *conv = list->data;
-		if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) {
+		if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv)) &&
+				purple_conversation_get_account(conv) == account) {
 			purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE));
 			purple_conversation_write(conv, NULL, _("The account has disconnected and you are no "
 						"longer in this chat. You will be automatically rejoined in the chat when "