# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1039665833 0
# Node ID b188b93ebf4802fff5436d7a48948c08ed556067
# Parent  f8090a166e5725c40788f273a8e1bfd5f1c6042b
[gaim-migrate @ 4274]
(23:01:14) LSchiere: okay, this patch fixes at least some of the problems saving sound, away, and font preferences. it makes spin buttons and entry
widgets save prefs on loss of focus or dialog close instead of on change.
(23:01:17) LSchiere: anything else it does?
(23:01:44) faceprint: it makes nothing save unless you hit close.  however, everything saves when you hit close.
(23:02:06) LSchiere: they still apply before close?
(23:02:09) faceprint: it should right most of the wrongs of prefs
(23:02:25) faceprint: they apply before close, but aren't written to disk every time you check or uncheck a checkbox or something
(23:02:27) Paco-Paco: it looks OK

committer: Tailor Script <tailor@pidgin.im>

diff -r f8090a166e57 -r b188b93ebf48 src/aim.c
--- a/src/aim.c	Wed Dec 11 15:05:00 2002 +0000
+++ b/src/aim.c	Thu Dec 12 04:03:53 2002 +0000
@@ -115,6 +115,8 @@
 	perl_end();
 #endif
 
+	save_prefs();
+
 	gtk_main_quit();
 }
 
diff -r f8090a166e57 -r b188b93ebf48 src/buddy.c
--- a/src/buddy.c	Wed Dec 11 15:05:00 2002 +0000
+++ b/src/buddy.c	Thu Dec 12 04:03:53 2002 +0000
@@ -1425,6 +1425,8 @@
 	perl_end();
 #endif
 
+	save_prefs();
+
 	gtk_main_quit();
 }
 
diff -r f8090a166e57 -r b188b93ebf48 src/core.c
--- a/src/core.c	Wed Dec 11 15:05:00 2002 +0000
+++ b/src/core.c	Thu Dec 12 04:03:53 2002 +0000
@@ -495,11 +495,14 @@
 
 void core_quit()
 {
+	save_prefs();
 #ifndef _WIN32
+	{
 	char buf[1024];
 	close(UI_fd);
 	sprintf(buf, "%s" G_DIR_SEPARATOR_S "gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), gaim_session);
 	unlink(buf);
 	debug_printf("Removed core\n");
+	}
 #endif
 }
diff -r f8090a166e57 -r b188b93ebf48 src/prefs.c
--- a/src/prefs.c	Wed Dec 11 15:05:00 2002 +0000
+++ b/src/prefs.c	Thu Dec 12 04:03:53 2002 +0000
@@ -82,6 +82,7 @@
 GtkTreeIter *prefs_notebook_add_page(char*, GdkPixbuf*, GtkWidget*, GtkTreeIter*, GtkTreeIter*, int);
 
 void delete_prefs(GtkWidget *asdf, void *gdsa) {
+	save_prefs();
 	prefs = NULL;
 	tree_v = NULL;
 	sound_entry = NULL;
@@ -1536,7 +1537,6 @@
 		gtk_button_clicked(GTK_BUTTON(debugbutton));
 	if (misc_options & OPT_MISC_DEBUG) {
 		misc_options ^= OPT_MISC_DEBUG;
-		save_prefs();
 	}
 	g_free(dw);
 	dw = NULL;
@@ -1629,8 +1629,6 @@
 
 	if (option == OPT_MISC_DEBUG)
 		show_debug();
-
-	save_prefs();
 }
 
 static void set_logging_option(GtkWidget *w, int option)
@@ -1639,16 +1637,12 @@
 
 	if (option == OPT_LOG_CONVOS || option == OPT_LOG_CHATS)
 		update_log_convs();
-
-	save_prefs();
 }
 
 static void set_blist_option(GtkWidget *w, int option)
 {
 	blist_options ^= option;
 
-	save_prefs();
-
 	if (!blist)
 		return;
 
@@ -1684,8 +1678,6 @@
 
 	if (option == OPT_CONVO_CHECK_SPELLING)
 		toggle_spellchk();
-
-	save_prefs();
 }
 
 static void set_im_option(GtkWidget *w, int option)
@@ -1704,8 +1696,6 @@
 
 	if (option == OPT_IM_NO_ANIMATION)
 		set_anim();
-
-	save_prefs();
 }
 
 static void set_chat_option(GtkWidget *w, int option)
@@ -1714,15 +1704,11 @@
 
 	if (option == OPT_CHAT_ONE_WINDOW)
 		chat_tabize();
-
-	save_prefs();
 }
 
 void set_sound_option(GtkWidget *w, int option)
 {
 	sound_options ^= option;
-
-	save_prefs();
 }
 
 static void set_font_option(GtkWidget *w, int option)
@@ -1730,8 +1716,6 @@
 	font_options ^= option;
 
 	update_font_buttons();
-
-	save_prefs();
 }
 
 static void set_away_option(GtkWidget *w, int option)
@@ -1740,8 +1724,6 @@
 
 	if (option == OPT_AWAY_QUEUE)
 		toggle_away_queue();
-
-	save_prefs();
 }
 
 GtkWidget *gaim_button(const char *text, guint *options, int option, GtkWidget *page)
@@ -1752,30 +1734,36 @@
 	gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0);
 	gtk_object_set_user_data(GTK_OBJECT(button), options);
 
-	if (options == &misc_options)
+	if (options == &misc_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_misc_option),
 				   (int *)option);
-	if (options == &logging_options)
+	} else if (options == &logging_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_logging_option),
 				   (int *)option);
-	if (options == &blist_options)
+	} else if (options == &blist_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_blist_option),
 				   (int *)option);
-	if (options == &convo_options)
+	} else if (options == &convo_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_convo_option),
 				   (int *)option);
-	if (options == &im_options)
+	} else if (options == &im_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_im_option),
 				   (int *)option);
-	if (options == &chat_options)
+	} else if (options == &chat_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_chat_option),
 				   (int *)option);
-	if (options == &font_options)
+	} else if (options == &font_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_font_option),
 				   (int *)option);
-	if (options == &sound_options)
+	} else if (options == &sound_options) {
 		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_sound_option),
 				   (int *)option);
+	} else if (options == &away_options) {
+		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_away_option),
+				   (int *)option);
+	} else {
+		debug_printf("gaim_button: \"%s\" has no signal handler attached to it!\n", text);
+	}
 	gtk_widget_show(button);
 
 	return button;
@@ -1873,6 +1861,7 @@
 	gtk_widget_set_style(pic, style);
 	gtk_style_unref(style);
 }
+
 void set_default_away(GtkWidget *w, gpointer i)
 {
 
@@ -1891,6 +1880,7 @@
 	int *value = gtk_object_get_user_data(GTK_OBJECT(spin));
 	*value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
 }
+
 GtkWidget *gaim_labeled_spin_button(GtkWidget *box, const gchar *title, int *val, int min, int max, GtkSizeGroup *sg)
 {
 	GtkWidget *hbox;
@@ -1912,7 +1902,7 @@
 	gtk_widget_set_usize(spin, 50, -1);
 	gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(adjust), "value-changed",
-			   GTK_SIGNAL_FUNC(update_spin_value), GTK_WIDGET(spin));
+			GTK_SIGNAL_FUNC(update_spin_value), GTK_WIDGET(spin));
 	gtk_widget_show(spin);
 
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), spin);
@@ -1966,7 +1956,6 @@
 	} else if (option == (int*)&blist_options) {
 		set_blist_tab();
 	}
-
 }
 
 static GtkWidget *gaim_dropdown(GtkWidget *box, const gchar *title, int *option, int clear, ...)
@@ -2063,6 +2052,7 @@
 	gtk_widget_show(swid);
 	return swid;
 }
+
 void apply_font_dlg(GtkWidget *w, GtkWidget *f)
 {
 	int i = 0;