changeset 19361:272d08484f7d

remove obsolote GNOME color pallete
author Sean Egan <seanegan@gmail.com>
date Wed, 22 Aug 2007 20:44:42 +0000
parents dbc4bdfb09a9
children cbc08c427db6
files pidgin/gtkconv.c
diffstat 1 files changed, 1 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Wed Aug 22 20:09:09 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 22 20:44:42 2007 +0000
@@ -100,36 +100,6 @@
 
 #define LUMINANCE(c) (float)((0.3*(c.red))+(0.59*(c.green))+(0.11*(c.blue)))
 
-#if 0
-/* These colors come from the default GNOME palette */
-static GdkColor nick_colors[] = {
-	{0, 47616, 46336, 43776},       /* Basic 3D Medium */
-	{0, 32768, 32000, 29696},       /* Basic 3D Dark */
-	{0, 22016, 20992, 18432},       /* 3D Shadow */
-	{0, 33536, 42496, 32512},       /* Green Medium */
-	{0, 23808, 29952, 21760},       /* Green Dark */
-	{0, 17408, 22016, 12800},       /* Green Shadow */
-	{0, 57344, 46592, 44800},       /* Red Hilight */
-	{0, 49408, 26112, 23040},       /* Red Medium */
-	{0, 34816, 17920, 12544},       /* Red Dark */
-	{0, 49408, 14336,  8704},       /* Red Shadow */
-	{0, 34816, 32512, 41728},       /* Purple Medium */
-	{0, 25088, 23296, 33024},       /* Purple Dark */
-	{0, 18688, 16384, 26112},       /* Purple Shadow */
-	{0, 40192, 47104, 53760},       /* Blue Hilight */
-	{0, 29952, 36864, 44544},       /* Blue Medium */
-	{0, 57344, 49920, 40448},       /* Face Skin Medium */
-	{0, 45824, 37120, 26880},       /* Face skin Dark */
-	{0, 33280, 26112, 18176},       /* Face Skin Shadow */
-	{0, 57088, 16896,  7680},       /* Accent Red */
-	{0, 39168,     0,     0},       /* Accent Red Dark */
-	{0, 17920, 40960, 17920},       /* Accent Green */
-	{0,  9728, 50944,  9728}        /* Accent Green Dark */
-};
-
-#define NUM_NICK_COLORS (sizeof(nick_colors) / sizeof(*nick_colors))
-#endif
-
 /* From http://www.w3.org/TR/AERT#color-contrast */
 #define MIN_BRIGHTNESS_CONTRAST 75
 #define MIN_COLOR_CONTRAST 200
@@ -8736,7 +8706,7 @@
 		angle = 270;
 
 #if GTK_CHECK_VERSION(2,6,0)
-	if (!angle && pidgin_conv_window_get_gtkconv_count(win) > 1) {
+	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), 4);
 	} else {