# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1197695544 0
# Node ID b9197011ddd6e32a967d8cec524be9299ffd086c
# Parent  2961a316058ce1707d85897072ab530031a91904# Parent  e81d5493626c846a3185677717025d27fe323b0b
merge of '1ec99cf95363c1e7c839780d51463b0c73d96e25'
     and '4e52f6d35023c9f4c4b5944f42784a1ac32bb0d8'

diff -r 2961a316058c -r b9197011ddd6 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Nov 28 14:38:43 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Dec 15 05:12:24 2007 +0000
@@ -6620,18 +6620,6 @@
 			style = NULL;
 		}
 		
-		// nosuke's tab width patch
-		if ((purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_LEFT|8)
-			 || purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8))
-			&& purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/trim_vertical_tabs"))
-			ellipsis = TRUE;
-
-		if (ellipsis)
-			title_tmp = pidgin_gtk_ellipsis_text(gtkconv->tab_label, title, 60, "...");
-		else
-			title_tmp = title;
-
-
 		if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT ||
 				gtkconv->unseen_state == PIDGIN_UNSEEN_NICK ||
 				gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT)