diff options
author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-12-29 23:58:47 +0800 |
---|---|---|
committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-12-29 23:58:47 +0800 |
commit | a4004017570744524ff2d0af3efab045821fd46f (patch) | |
tree | 9a15f253d9c45a90a8794143ecdd854650d58af1 /libempathy-gtk/empathy-contact-list-view.c | |
parent | 0cfd80847f0d66967f56c7d6b3eb46793f725859 (diff) | |
download | gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar.gz gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar.bz2 gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar.lz gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar.xz gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.tar.zst gsoc2013-empathy-a4004017570744524ff2d0af3efab045821fd46f.zip |
Revert "merge git work"
This reverts commit 0cfd80847f0d66967f56c7d6b3eb46793f725859.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@519 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-view.c')
-rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 36 |
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, |