From: Will Thompson <will.thompson@collabora.co.uk>
Date: Mon, 30 Jan 2012 13:21:47 +0000 (+0000)
Subject: Don't warn before leaving disconnected chatrooms
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=0481b358c7a6c4336690961bb284df1370c0b29c

Don't warn before leaving disconnected chatrooms

https://bugzilla.gnome.org/show_bug.cgi?id=591756
---

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 337bae94..63496859 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -342,13 +342,25 @@ confirm_close (EmpathyChatWindow *window,
 	gtk_window_present (GTK_WINDOW (dialog));
 }
 
+/* Returns TRUE if we should check if the user really wants to leave.  If it's
+ * a multi-user chat, and it has a TpChat (so there's an underlying channel, so
+ * the user is actually in the room as opposed to having been kicked or gone
+ * offline or something), then we should check.
+ */
+static gboolean
+chat_needs_close_confirmation (EmpathyChat *chat)
+{
+	return (empathy_chat_is_room (chat)
+		&& empathy_chat_get_tp_chat (chat) != NULL);
+}
+
 static void
 maybe_close_chat (EmpathyChatWindow *window,
                   EmpathyChat *chat)
 {
 	g_return_if_fail (chat != NULL);
 
-	if (empathy_chat_is_room (chat)) {
+	if (chat_needs_close_confirmation (chat)) {
 		confirm_close (window, FALSE, 1, chat);
 	} else {
 		empathy_chat_window_remove_chat (window, chat);
@@ -1421,7 +1433,7 @@ chat_window_delete_event_cb (GtkWidget        *dialog,
 	DEBUG ("Delete event received");
 
 	for (l = priv->chats; l != NULL; l = l->next) {
-		if (empathy_chat_is_room (l->data)) {
+		if (chat_needs_close_confirmation (l->data)) {
 			chat = l->data;
 			n_rooms++;
 		}