pidgin: a83c5a43: Show the message only for the chats for ...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: a83c5a439ea7250a77b9d56ccf0dd25cc3ec36d3
Ancestor: 30d7397ebfa0e1d01b4951841f175a642d37a9ce
Author: sadrul at pidgin.im
Date: 2009-10-22T01:21:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a83c5a439ea7250a77b9d56ccf0dd25cc3ec36d3

Modified files:
        finch/gntconv.c pidgin/gtkconv.c

ChangeLog: 

Show the message only for the chats for the account signing off.

-------------- next part --------------
============================================================
--- finch/gntconv.c	d77932f148a79f2275ea43b050687c588b18aa04
+++ finch/gntconv.c	b7cc42c8d7b78b543fd59154f6b7e421faa14632
@@ -371,12 +371,14 @@ account_signing_off(PurpleConnection *gc
 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 "
============================================================
--- pidgin/gtkconv.c	a23c10e22d9d7cea516f985d4fe5c68d0d7399f7
+++ pidgin/gtkconv.c	faf74b7eba3611d8749e62037710ab646fd075a1
@@ -7605,12 +7605,14 @@ account_signing_off(PurpleConnection *gc
 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 "