pidgin.2.4.3: 12868977: The checkbox needs to be toggled back on...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 128689778b1cff20cc4ac5ce02cd11ea2454b82b
Ancestor: 7797cde0a91cd772f687f04b41d0dc7aadcc9dfa
Author: nosnilmot at pidgin.im
Date: 2008-06-19T18:13:32
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/128689778b1cff20cc4ac5ce02cd11ea2454b82b

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

The checkbox needs to be toggled back on only when it's alive. And the
accels are auto-saved when changed.
applied changes from 366dc2810da183961859a6bd54fd7cac1d0a6863
             through 69693756ac2eea13c0b8f858fa1d3ae4a31900e9

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	68ad166eaee89f27c693016e197be4c58ef61c58
+++ pidgin/gtkprefs.c	f31fdda4e32aaa30d21576337d75c2783a8505cc
@@ -879,9 +879,6 @@ escape_closes_conversation_cb(GtkWidget 
 	 */
 	if(!changed)
 		purple_debug_warning("gtkprefs", "Escape accel failed to change\n");
-
-	/* TODO: create pidgin_accels_schedule_save */
-	pidgin_save_accels_cb(NULL, 0, 0, NULL, NULL);
 }
 
 
@@ -919,8 +916,8 @@ keyboard_shortcuts(GtkWidget *page)
 	escape_closes_conversation_cb_id = g_signal_connect(checkbox,
 		"clicked", G_CALLBACK(escape_closes_conversation_cb), NULL);
 
-	g_signal_connect(map, "changed::" CONVERSATION_CLOSE_ACCEL_PATH,
-		G_CALLBACK(conversation_close_accel_changed_cb), checkbox);
+	g_signal_connect_object(map, "changed::" CONVERSATION_CLOSE_ACCEL_PATH,
+		G_CALLBACK(conversation_close_accel_changed_cb), checkbox, (GConnectFlags)0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), checkbox, FALSE, FALSE, 0);
 }