Use a flat namespace for internal includes

[empathy.git] / libempathy-gtk / empathy-user-info.c

diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 75a6dbd778cf6d2aa021b0970327cf7c828c440e..0bbb57652b216cd8b14ccf99d2e83da6857b15ec 100644 (file)
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -23,9 +23,9 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"
@@ -184,8 +184,8 @@ fill_contact_info_grid (EmpathyUserInfo *self)
 
   connection = tp_account_get_connection (self->priv->account);
   contact = tp_connection_get_self_contact (connection);
-  specs = tp_connection_get_contact_info_supported_fields (connection);
-  info = tp_contact_get_contact_info (contact);
+  specs = tp_connection_dup_contact_info_supported_fields (connection);
+  info = tp_contact_dup_contact_info (contact);
 
   /* Look at the fields set in our vCard */
   for (l = info; l != NULL; l = l->next)
@@ -304,8 +304,8 @@ fill_contact_info_grid (EmpathyUserInfo *self)
       n_rows++;
     }
 
-  g_list_free (specs);
-  g_list_free (info);
+  tp_contact_info_spec_list_free (specs);
+  tp_contact_info_list_free (info);
 
   return n_rows;
 }