changeset 11922:19b46e4e43a0

[gaim-migrate @ 14213] part of sf patch #1342853, from Richard Gobeille Gray out a buddy icon animate preference if buddy icons are disabled committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 31 Oct 2005 05:02:15 +0000
parents 8140885c022c
children ab0f16a72e89
files COPYRIGHT src/gtkprefs.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Mon Oct 31 04:38:58 2005 +0000
+++ b/COPYRIGHT	Mon Oct 31 05:02:15 2005 +0000
@@ -88,6 +88,7 @@
 François Gagné
 Evgueni V. Gavrilov
 Ignacy Gawedzki
+Richard Gobeille
 Michael Golden
 Charlie Gordon
 Ryan C. Gordon
--- a/src/gtkprefs.c	Mon Oct 31 04:38:58 2005 +0000
+++ b/src/gtkprefs.c	Mon Oct 31 05:02:15 2005 +0000
@@ -796,6 +796,8 @@
 	GtkWidget *toolbar;
 	GtkWidget *hbox;
 	GtkWidget *vbox2;
+	GtkWidget *iconpref1;
+	GtkWidget *iconpref2;
 
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER);
@@ -806,10 +808,16 @@
 	                        "/gaim/gtk/conversations/passthrough_unknown_commands", vbox);
 	gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"),
 				"/gaim/gtk/conversations/show_incoming_formatting", vbox);
-	gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
+
+	iconpref1 = gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
-	gaim_gtk_prefs_checkbox(_("Enable buddy ic_on animation"),
+	iconpref2 = gaim_gtk_prefs_checkbox(_("Enable buddy ic_on animation"),
 			"/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
+	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/im/show_buddy_icons"))
+		gtk_widget_set_sensitive(iconpref2, FALSE);
+	g_signal_connect(G_OBJECT(iconpref1), "clicked",
+					 G_CALLBACK(gaim_gtk_toggle_sensitive), iconpref2);
+
 	gaim_gtk_prefs_checkbox(_("_Notify buddies that you are typing to them"),
 			"/core/conversations/im/send_typing", vbox);
 #ifdef USE_GTKSPELL