Revert "merge git work"

This reverts commit 0cfd80847f0d66967f56c7d6b3eb46793f725859.

svn path=/trunk/; revision=519

1 files changed, 15 insertions, 21 deletions

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 73afd299a..9b6a98a6a 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -1034,27 +1034,21 @@ contact_list_view_cell_set_background (EmpathyContactListView *view,
 
 	style = gtk_widget_get_style (GTK_WIDGET (view));
 
-	if (!is_group) {
-		if (is_active) {
-			color = style->bg[GTK_STATE_SELECTED];
-
-			/* Here we take the current theme colour and add it to
-			 * the colour for white and average the two. This
-			 * gives a colour which is inline with the theme but
-			 * slightly whiter.
-			 */
-			color.red = (color.red + (style->white).red) / 2;
-			color.green = (color.green + (style->white).green) / 2;
-			color.blue = (color.blue + (style->white).blue) / 2;
-
-			g_object_set (cell,
-				      "cell-background-gdk", &color,
-				      NULL);
-		} else {
-			g_object_set (cell,
-				      "cell-background-gdk", NULL,
-				      NULL);
-		}
+	if (!is_group && is_active) {
+		color = style->bg[GTK_STATE_SELECTED];
+
+		/* Here we take the current theme colour and add it to
+		 * the colour for white and average the two. This
+		 * gives a colour which is inline with the theme but
+		 * slightly whiter.
+		 */
+		color.red = (color.red + (style->white).red) / 2;
+		color.green = (color.green + (style->white).green) / 2;
+		color.blue = (color.blue + (style->white).blue) / 2;
+
+		g_object_set (cell,
+			      "cell-background-gdk", &color,
+			      NULL);
 	} else {
 		g_object_set (cell,
 			      "cell-background-gdk", NULL,