Do not use the server entry's value if it's hidden. Do not highlight

2007-05-25  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/gossip-new-chatroom-dialog.c: Do not use the server
	entry's value if it's hidden.
	* libempathy-gtk/gossip-contact-list-view.c:Do not highlight groups
	when adding them in the roster.
	* libempathy/empathy-tp-contact-list.c: DO not create new GossipContact
	object in presence/avatar/alias changed signal if we don't already know
	that contact from a contact list channel. This should fix DBus max
	pending calls limit reached in some cases.


svn path=/trunk/; revision=93

1 files changed, 1 insertions, 24 deletions

diff --git a/libempathy-gtk/gossip-contact-list-view.c b/libempathy-gtk/gossip-contact-list-view.c
index b9ee7063f..3cad7821d 100644
--- a/libempathy-gtk/gossip-contact-list-view.c
+++ b/libempathy-gtk/gossip-contact-list-view.c
@@ -1079,32 +1079,9 @@ contact_list_view_cell_set_background (GossipContactListView *view,
 				      NULL);
 		}
 	} else {
-#if 0
-		gint color_sum_normal;
-		gint color_sum_selected;
-		
-		color = style->base[GTK_STATE_SELECTED];
-		color_sum_normal = color.red+color.green+color.blue;
-		color = style->base[GTK_STATE_NORMAL];
-		color_sum_selected = color.red+color.green+color.blue;
-		color = style->text_aa[GTK_STATE_INSENSITIVE];
-
-		if (color_sum_normal < color_sum_selected) { 
-			/* Found a light theme */
-			color.red = (color.red + (style->white).red) / 2;
-			color.green = (color.green + (style->white).green) / 2;
-			color.blue = (color.blue + (style->white).blue) / 2;
-		} else { 
-			/* Found a dark theme */
-			color.red = (color.red + (style->black).red) / 2;
-			color.green = (color.green + (style->black).green) / 2;
-			color.blue = (color.blue + (style->black).blue) / 2;
-		}
-
 		g_object_set (cell,
-			      "cell-background-gdk", &color,
+			      "cell-background-gdk", NULL,
 			      NULL);
-#endif
 	}
 }