Merge remote-tracking branch 'origin/gnome-3-8'

[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 d52abb4851fcc434b25be04cec0cedcc8e0fcadc..44bbd7eabd9ec9d48212c96930159194674a1a55 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,12 +22,10 @@
  */
 
 #include "config.h"
-
-#include <string.h>
-
-#include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-text.h"
 
+#include "empathy-utils.h"
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
 typedef struct {
        gchar    *name;
@@ -364,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)