[Gaim-commits] CVS: gaim/src dialogs.c,1.306,1.307

[Rob F. <rob...@us...>]

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

Modified Files:
	dialogs.c 
Log Message:
hmm



Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- dialogs.c	13 Mar 2002 04:25:32 -0000	1.306
+++ dialogs.c	13 Mar 2002 05:14:17 -0000	1.307
@@ -3317,6 +3317,7 @@
 	GtkWidget *bbox;
 	GSList *smilies;
 	int smiley_count = 0;
+	int total_count = 0;
 
 	if (c->smiley_dialog)
 		return;
@@ -3372,6 +3373,19 @@
 
 		smilies = c->gc->prpl->smiley_list();
 
+		while (smilies) {
+			struct _prpl_smiley *smile =
+				(struct _prpl_smiley *)smilies->data;
+
+			if (smile->show) {
+				total_count++;
+			}
+
+			smilies = g_slist_next(smilies);
+		}
+
+		smilies = c->gc->prpl->smiley_list();
+
 		smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
 		gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
 
@@ -3381,7 +3395,7 @@
 
 			if (smile->show) {
 
-				if ((!(smiley_count % 4)) && (smiley_count > 0)) {
+				if ((!(smiley_count % ((int)(sqrt(total_count))))) && (smiley_count > 0)) {
 					smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
 					gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
 				}