Use a flat namespace for internal includes

[empathy.git] / libempathy-gtk / empathy-cell-renderer-text.c

diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index d0590ef8fbd1803d186dfca51a470b07914b0267..afefb2af566e22803c957d4653d4e3f5f722cd12 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -23,9 +23,7 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <libempathy/empathy-utils.h>
+#include "empathy-utils.h"
 #include "empathy-cell-renderer-text.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
@@ -298,10 +296,12 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
                                gboolean                selected)
 {
        EmpathyCellRendererTextPriv *priv;
+       const PangoFontDescription *font_desc;
        PangoAttrList              *attr_list;
        PangoAttribute             *attr_color = NULL, *attr_size;
-       GtkStyle                   *style;
+       GtkStyleContext            *style;
        gchar                      *str;
+       gint                        font_size;
 
        priv = GET_PRIV (cell);
 
@@ -324,21 +324,25 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
                return;
        }
 
-       style = gtk_widget_get_style (widget);
+       style = gtk_widget_get_style_context (widget);
 
        attr_list = pango_attr_list_new ();
 
-       attr_size = pango_attr_size_new (pango_font_description_get_size (style->font_desc) / 1.2);
+       font_desc = gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL);
+       font_size = pango_font_description_get_size (font_desc);
+       attr_size = pango_attr_size_new (font_size / 1.2);
        attr_size->start_index = strlen (priv->name) + 1;
        attr_size->end_index = -1;
        pango_attr_list_insert (attr_list, attr_size);
 
        if (!selected) {
-               GdkColor color;
+               GdkRGBA color;
 
-               color = style->text_aa[GTK_STATE_NORMAL];
+               gtk_style_context_get_color (style, 0, &color);
 
-               attr_color = pango_attr_foreground_new (color.red, color.green, color.blue);
+               attr_color = pango_attr_foreground_new (color.red * 0xffff,
+                                                       color.green * 0xffff,
+                                                       color.blue * 0xffff);
                attr_color->start_index = attr_size->start_index;
                attr_color->end_index = -1;
                pango_attr_list_insert (attr_list, attr_color);
@@ -358,8 +362,8 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
                        status = empathy_presence_get_default_message (priv->presence_type);
                }
 
-               if (!priv->is_group && priv->types != NULL && g_strv_length (priv->types) > 0
-                   && !tp_strdiff (priv->types[0], "phone")) {
+               if (!priv->is_group &&
+                               empathy_client_types_contains_mobile_device (priv->types)) {
                        on_a_phone = TRUE;
                        /* We want the phone black. */
                        if (attr_color)