Index: src/gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.732
diff -u -p -r1.732 gtkconv.c
--- src/gtkconv.c	22 Jan 2006 03:01:26 -0000	1.732
+++ src/gtkconv.c	26 Jan 2006 16:05:41 -0000
@@ -7550,9 +7550,10 @@ gaim_gtk_conv_window_add_gtkconv(GaimGtk
 #if GTK_CHECK_VERSION(2,6,0)
 	if (!angle)
 		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-	gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6);
 	if (tabs_side) {
-		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), MIN(g_utf8_strlen(tmp_lab, -1), 18));
+		gtk_label_set_max_width_chars(GTK_LABEL(gtkconv->tab_label), MIN(g_utf8_strlen(tmp_lab, -1), 18));
+	} else {
+		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6);
 	}
 	if (angle)
 		gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);