[Gaim-commits] CVS: gaim/src prefs.c,1.214,1.215 conversation.c,1.333,1.334

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12854/src

Modified Files:
	prefs.c conversation.c 
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- prefs.c	6 Mar 2002 00:18:02 -0000	1.214
+++ prefs.c	6 Mar 2002 05:26:58 -0000	1.215
@@ -1009,12 +1009,13 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
-	hbox = gtk_hbox_new(FALSE, 5);	
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
-	gtk_widget_show(hbox);
-	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, hbox);
+	gaim_button(_("Hide Buddy Icons"), &im_options, OPT_IM_HIDE_ICONS, vbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
 	
-	gaim_button(_("Disable Buddy Icon Animation"), &im_options, OPT_IM_NO_ANIMATION, hbox);
+	gaim_button(_("Disable Buddy Icon Animation"), &im_options, OPT_IM_NO_ANIMATION, vbox);
 #endif
 
 	gtk_widget_show(prefdialog);
@@ -2724,6 +2725,9 @@
 
 	if (option == OPT_IM_ALIAS_TAB)
 		set_convo_titles();
+
+	if (option == OPT_IM_NO_ANIMATION)
+		set_anim();
 
 	save_prefs();
 }

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- conversation.c	6 Mar 2002 00:18:02 -0000	1.333
+++ conversation.c	6 Mar 2002 05:26:58 -0000	1.334
@@ -3288,7 +3288,7 @@
 	gtk_container_add(GTK_CONTAINER(event), c->icon);
 	gtk_widget_show(c->icon);
 	if(im_options & OPT_IM_NO_ANIMATION)
-		stop_anim(c->icon, c);		
+		stop_anim(NULL, c);		
 	gdk_pixmap_unref(pm);
 	if (bm)
 		gdk_bitmap_unref(bm);
@@ -3307,6 +3307,18 @@
 	GList *c = conversations;
 	while (c) {
 		update_icon(c->data);
+		c = c->next;
+	}
+}
+
+void set_anim()
+{
+	GList *c = conversations;
+	while (c) {
+		if(im_options & OPT_IM_NO_ANIMATION)
+			stop_anim(NULL, c->data);
+		else 
+			start_anim(NULL, c->data);
 		c = c->next;
 	}
 }