]> git.0d.be Git - empathy.git/commitdiff
individual-view: use new GTK+ style API (#636500)
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 15 Dec 2010 13:53:11 +0000 (14:53 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 15 Dec 2010 15:47:25 +0000 (16:47 +0100)
libempathy-gtk/empathy-individual-view.c

index 30098e534bcb7137fd864545f02d0c79b00000ad..38ef61e5447bd6fb25e97b66e91c3eadafdd7e6a 100644 (file)
@@ -1047,28 +1047,27 @@ individual_view_cell_set_background (EmpathyIndividualView *view,
     gboolean is_group,
     gboolean is_active)
 {
-  GdkColor color;
-  GtkStyle *style;
-
-  style = gtk_widget_get_style (GTK_WIDGET (view));
-
   if (!is_group && is_active)
     {
-      color = style->bg[GTK_STATE_SELECTED];
+      GtkStyleContext *style;
+      GdkRGBA color;
+
+      style = gtk_widget_get_style_context (GTK_WIDGET (view));
+
+      gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
+          &color);
 
       /* 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;
+      empathy_make_color_whiter (&color);
 
-      g_object_set (cell, "cell-background-gdk", &color, NULL);
+      g_object_set (cell, "cell-background-rgba", &color, NULL);
     }
   else
-    g_object_set (cell, "cell-background-gdk", NULL, NULL);
+    g_object_set (cell, "cell-background-rgba", NULL, NULL);
 }
 
 static void