# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1187302691 0
# Node ID c003aa584909a6efc276e6a0ad0982644c619545
# Parent  20c2c5a68aee090ba35e4f086fad004defd3e769
Remove truncation until we can do it smarter

diff -r 20c2c5a68aee -r c003aa584909 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Aug 16 20:53:24 2007 +0000
+++ b/pidgin/gtkconv.c	Thu Aug 16 22:18:11 2007 +0000
@@ -6279,7 +6279,7 @@
 			(fields & PIDGIN_CONV_SET_TITLE) ||
     			(fields & PIDGIN_CONV_TOPIC))
 	{
-		char *title, *truncate = NULL, truncchar = '\0';
+		char *title;
 		PurpleConvIm *im = NULL;
 		PurpleAccount *account = purple_conversation_get_account(conv);
 	 	PurpleBuddy *buddy = NULL;
@@ -6300,12 +6300,6 @@
 		else
 			title = g_strdup(purple_conversation_get_title(conv));
 
-		if (((truncate = strchr(title, ' ')) && strcmp(title, conv->name)) || 
-		    (truncate = strchr(title, '@'))) {
-			truncchar = *truncate;
-			*truncate = '\0';
-		}
-
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 			buddy = purple_find_buddy(account, conv->name);
 			if (buddy) {
@@ -6380,9 +6374,6 @@
 		else
 			gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title);
 		
-		if (truncate)
-			*truncate = truncchar;
-
 		if (pidgin_conv_window_is_active_conversation(conv))
 			update_typing_icon(gtkconv);
 
@@ -8678,6 +8669,7 @@
 	/* Status icon. */
 	gtkconv->icon = gtk_image_new();
 	gtkconv->menu_icon = gtk_image_new();
+	gtk_widget_show(gtkconv->icon);
 	update_tab_icon(conv);
 
 	/* Tab label. */
@@ -8738,7 +8730,7 @@
 #if GTK_CHECK_VERSION(2,6,0)
 	if (!angle && pidgin_conv_window_get_gtkconv_count(win) > 1) {
 		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_END,  NULL);
-		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 6);
+		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), 4);
 	} else {
 		g_object_set(G_OBJECT(gtkconv->tab_label), "ellipsize", PANGO_ELLIPSIZE_NONE, NULL);
 		gtk_label_set_width_chars(GTK_LABEL(gtkconv->tab_label), -1);