individual-menu: stop creating single_individual

[empathy.git] / libempathy-gtk / empathy-contact-widget.c

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index be0b745f2979ba1e12d0358f69c064f278916c65..505dad4029bd12c842fa581efd150ec55df0453e 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -24,11 +24,12 @@
 
 #include <glib/gi18n-lib.h>
 #include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-string-parser.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-avatar-image.h"
 #include "empathy-client-factory.h"
 #include "empathy-groups-widget.h"
-#include "empathy-string-parser.h"
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
@@ -359,7 +360,7 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *self)
 
   status = empathy_contact_get_status (self->priv->contact);
   if (status != NULL)
-    markup_text = empathy_add_link_markup (status);
+    markup_text = tpaw_add_link_markup (status);
   gtk_label_set_markup (GTK_LABEL (self->priv->label_status), markup_text);
   g_free (markup_text);
 
@@ -505,7 +506,7 @@ contact_widget_change_contact (EmpathyContactWidget *self)
       return;
 
   id = gtk_entry_get_text (GTK_ENTRY (self->priv->widget_id));
-  if (!EMP_STR_EMPTY (id))
+  if (!TPAW_STR_EMPTY (id))
     {
       EmpathyClientFactory *factory;