[Gaim-commits] CVS: gaim/src gtkblist.c,1.114,1.115 gtkprefs.c,1.88,1.89

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22373/src

Modified Files:
	gtkblist.c gtkprefs.c 
Log Message:
choice is a good thing


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -p -r1.114 -r1.115
--- gtkblist.c	20 Oct 2003 04:08:13 -0000	1.114
+++ gtkblist.c	20 Oct 2003 05:08:05 -0000	1.115
@@ -1858,14 +1858,16 @@ static gchar *gaim_gtk_blist_get_name_ma
 		}
 	}
 
-	if (b->idle > 0) {
+	if (b->idle > 0 &&
+			gaim_prefs_get_bool("/gaim/gtk/blist/show_idle_time")) {
 		if (ihrs)
 			idletime = g_strdup_printf(_("Idle (%dh%02dm) "), ihrs, imin);
 		else
 			idletime = g_strdup_printf(_("Idle (%dm) "), imin);
 	}
 
-	if (b->evil > 0)
+	if (b->evil > 0 &&
+			gaim_prefs_get_bool("/gaim/gtk/blist/show_warning_level"))
 		warning = g_strdup_printf(_("Warned (%d%%) "), b->evil);
 
 	if(!GAIM_BUDDY_IS_ONLINE(b) && !statustext)
@@ -2300,6 +2302,14 @@ static void gaim_gtk_blist_show(GaimBudd
 	blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks,
 			GINT_TO_POINTER(
 				gaim_prefs_connect_callback("/gaim/gtk/blist/show_buddy_icons",
+					_prefs_change_redo_list, NULL)));
+	blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks,
+			GINT_TO_POINTER(
+				gaim_prefs_connect_callback("/gaim/gtk/blist/show_warning_level",
+					_prefs_change_redo_list, NULL)));
+	blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks,
+			GINT_TO_POINTER(
+				gaim_prefs_connect_callback("/gaim/gtk/blist/show_idle_time",
 					_prefs_change_redo_list, NULL)));
 	blist_prefs_callbacks = g_slist_prepend(blist_prefs_callbacks,
 			GINT_TO_POINTER(

Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -p -r1.88 -r1.89
--- gtkprefs.c	5 Oct 2003 23:50:40 -0000	1.88
+++ gtkprefs.c	20 Oct 2003 05:08:05 -0000	1.89
@@ -812,13 +812,12 @@ GtkWidget *hotkeys_page() {
 GtkWidget *list_page() {
 	GtkWidget *ret;
 	GtkWidget *vbox;
-	GtkWidget *button, *warn_checkbox, *idle_checkbox;
 	GList *l= NULL;
 	GSList *sl;
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
-	
-	
+
+
 	vbox = gaim_gtk_make_frame (ret, _("Buddy List Sorting"));
 
 	for (sl = gaim_gtk_blist_sort_methods; sl != NULL; sl = sl->next) {
@@ -851,27 +850,14 @@ GtkWidget *list_page() {
 				  "/gaim/gtk/blist/show_group_count", vbox);
 
 	vbox = gaim_gtk_make_frame (ret, _("Buddy Display"));
-	button = prefs_checkbox(_("Show buddy _icons"),
-						   "/gaim/gtk/blist/show_buddy_icons", vbox);
-	warn_checkbox = prefs_checkbox(_("Show _warning levels"),
-								   "/gaim/gtk/blist/show_warning_level", vbox);
-
-	idle_checkbox = prefs_checkbox(_("Show idle _times"),
-								   "/gaim/gtk/blist/show_idle_time", vbox);
-
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), warn_checkbox);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), idle_checkbox);
-
-	if (gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons")) {
-
-		gtk_widget_set_sensitive(GTK_WIDGET(warn_checkbox), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(idle_checkbox), FALSE);
-	}
-
+	prefs_checkbox(_("Show buddy _icons"),
+			"/gaim/gtk/blist/show_buddy_icons", vbox);
+	prefs_checkbox(_("Show _warning levels"),
+			"/gaim/gtk/blist/show_warning_level", vbox);
+	prefs_checkbox(_("Show idle _times"),
+			"/gaim/gtk/blist/show_idle_time", vbox);
 	prefs_checkbox(_("Dim i_dle buddies"),
-				  "/gaim/gtk/blist/grey_idle_buddies", vbox);
+			"/gaim/gtk/blist/grey_idle_buddies", vbox);
 
 	gtk_widget_show_all(ret);