im.pidgin.pidgin: 902c6324faa755dfbceafd40ebf88ef850d06c9b

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 902c6324faa755dfbceafd40ebf88ef850d06c9b
Ancestor: 3639bb4d5d5a867f6bdb2a82be21e4887179b929
Author: nosnilmot at pidgin.im
Date: 2008-02-12T03:16:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/902c6324faa755dfbceafd40ebf88ef850d06c9b

Modified files:
        pidgin/gtkconv.c pidgin/gtkprefs.c

ChangeLog: 

Bring back the "Close IMs immediately when the tab is closed" pref. As far
as I'm concerned, this can go when we have better logic for when logs are
cycled, it's been discussed on devel at c.p.i a few times but nothing happened.
John Bailey also dislikes the lack of this preference.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	36ebed693314aabd4836913f85e4d122cf28865a
+++ pidgin/gtkconv.c	99510514ab71d30ff225dcd08bbc64e4ad7c31cb
@@ -238,7 +238,10 @@ close_conv_cb(GtkWidget *w, GdkEventButt
 	switch (purple_conversation_get_type(conv)) {
 		case PURPLE_CONV_TYPE_IM:
 		{
-			hide_conv(gtkconv, TRUE);
+			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately"))
+				close_this_sucker(gtkconv);
+			else
+				hide_conv(gtkconv, TRUE);
 			break;
 		}
 		case PURPLE_CONV_TYPE_CHAT:
@@ -7641,6 +7644,7 @@ pidgin_conversations_init(void)
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", TRUE);
 
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "never");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", TRUE);
 
 #ifdef _WIN32
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", FALSE);
============================================================
--- pidgin/gtkprefs.c	6a6c98bb3aae9261b4cd2749223e853277df05d4
+++ pidgin/gtkprefs.c	9e5b577d41296d852cc46d3cc26232a4d09b9e1d
@@ -943,6 +943,8 @@ conv_page(void)
 
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
+	pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"),
+				PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", vbox);
 
 	iconpref1 = pidgin_prefs_checkbox(_("Show _detailed information"),
 			PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox);
@@ -2195,7 +2197,6 @@ void pidgin_prefs_update_old()
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_group_count");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_warning_level");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/button_type");
-	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/close_immediately");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ctrl_enter_sends");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/enter_sends");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/escape_closes");