diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-29 23:49:47 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-29 23:49:47 +0800 |
| commit | b8607414ea0e41c44a09d31ebcd0437a3c867a24 (patch) | |
| tree | 0004eceb52b4bb3a4da1275057e46ea80e840a05 /libempathy-gtk/empathy-contact-list-view.c | |
| parent | 736ff5bf9f668528f1a1db1c8c135a8165a1b044 (diff) | |
| download | gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar.gz gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar.bz2 gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar.lz gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar.xz gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.tar.zst gsoc2013-empathy-b8607414ea0e41c44a09d31ebcd0437a3c867a24.zip | |
merge git work
svn path=/trunk/; revision=518
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-view.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 9b6a98a6a..73afd299a 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -1034,21 +1034,27 @@ contact_list_view_cell_set_background (EmpathyContactListView *view, style = gtk_widget_get_style (GTK_WIDGET (view)); - 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); + 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); + } } else { g_object_set (cell, "cell-background-gdk", NULL, |