contactinfo-utils: move from Empathy to tp-account-widgets

https://bugzilla.gnome.org/show_bug.cgi?id=699492

6 files changed, 31 insertions, 31 deletions

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 43e768913..0117b15da 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -41,7 +41,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-chat.c				\
 	empathy-contact-blocking-dialog.c	\
 	empathy-contact-chooser.c		\
-	empathy-contactinfo-utils.c		\
 	empathy-contact-search-dialog.c		\
 	empathy-contact-widget.c		\
 	empathy-dialpad-widget.c		\
@@ -107,7 +106,6 @@ libempathy_gtk_headers =			\
 	empathy-contact-chooser.h		\
 	empathy-contact-search-dialog.h		\
 	empathy-contact-widget.h		\
-	empathy-contactinfo-utils.h		\
 	empathy-dialpad-widget.h		\
 	empathy-dialpad-button.h		\
 	empathy-geometry.h			\
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 728f4143a..03490bcba 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -24,6 +24,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-contactinfo-utils.h>
 #include <tp-account-widgets/tpaw-time.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
@@ -32,7 +33,6 @@
 #endif
 
 #include "empathy-avatar-image.h"
-#include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-location.h"
@@ -296,13 +296,13 @@ details_update_show (EmpathyIndividualWidget *self,
   TpAccount *account;
 
   info = tp_contact_dup_contact_info (contact);
-  info = g_list_sort (info, (GCompareFunc) empathy_contact_info_field_cmp);
+  info = g_list_sort (info, (GCompareFunc) tpaw_contact_info_field_cmp);
   for (l = info; l != NULL; l = l->next)
     {
       TpContactInfoField *field = l->data;
       gchar *title;
       const gchar *value;
-      EmpathyContactInfoFormatFunc format;
+      TpawContactInfoFormatFunc format;
       GtkWidget *title_widget, *value_widget;
 
       if (field->field_value == NULL || field->field_value[0] == NULL)
@@ -310,7 +310,7 @@ details_update_show (EmpathyIndividualWidget *self,
 
       value = field->field_value[0];
 
-      if (!empathy_contact_info_lookup_field (field->field_name,
+      if (!tpaw_contact_info_lookup_field (field->field_name,
           NULL, &format))
         {
           DEBUG ("Unhandled ContactInfo field: %s", field->field_name);
@@ -322,7 +322,7 @@ details_update_show (EmpathyIndividualWidget *self,
         continue;
 
       /* Add Title */
-      title = empathy_contact_info_field_label (field->field_name,
+      title = tpaw_contact_info_field_label (field->field_name,
           field->parameters, TRUE);
       title_widget = gtk_label_new (title);
 
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index dbb6e084c..0cda19d19 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -22,10 +22,10 @@
 
 #include <glib/gi18n-lib.h>
 #include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-contactinfo-utils.h>
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"
-#include "empathy-contactinfo-utils.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -178,7 +178,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
   GList *specs, *l;
   guint n_rows = 0;
   GList *info;
-  const char **field_names = empathy_contact_info_get_field_names (NULL);
+  const char **field_names = tpaw_contact_info_get_field_names (NULL);
   guint i;
 
   g_assert (self->priv->details_to_set == NULL);
@@ -237,7 +237,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
 
   /* Add widgets for supported fields */
   self->priv->details_to_set = g_list_sort (self->priv->details_to_set,
-      (GCompareFunc) empathy_contact_info_field_spec_cmp);
+      (GCompareFunc) tpaw_contact_info_field_spec_cmp);
 
   for (l = self->priv->details_to_set; l != NULL; l= g_list_next (l))
     {
@@ -247,7 +247,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
       gboolean has_field;
       char *title;
 
-      has_field = empathy_contact_info_lookup_field (field->field_name,
+      has_field = tpaw_contact_info_lookup_field (field->field_name,
           NULL, NULL);
       if (!has_field)
         {
@@ -271,7 +271,7 @@ fill_contact_info_grid (EmpathyUserInfo *self)
         }
 
       /* Add Title */
-      title = empathy_contact_info_field_label (field->field_name,
+      title = tpaw_contact_info_field_label (field->field_name,
           field->parameters,
           (spec->flags & TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT));
       label = gtk_label_new (title);
diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am
index 9aee73442..5397854c2 100644
--- a/tp-account-widgets/Makefile.am
+++ b/tp-account-widgets/Makefile.am
@@ -23,6 +23,7 @@ libtp_account_widgets_sources =            	\
 	tpaw-account-widget-sip.c		\
 	tpaw-builder.c				\
 	tpaw-connection-managers.c		\
+	tpaw-contactinfo-utils.c		\
 	tpaw-keyring.c				\
 	tpaw-irc-network-chooser.c		\
 	tpaw-irc-network-chooser-dialog.c	\
@@ -44,6 +45,7 @@ libtp_account_widgets_headers =			\
 	tpaw-account-widget-sip.h		\
 	tpaw-builder.h				\
 	tpaw-connection-managers.h		\
+	tpaw-contactinfo-utils.h		\
 	tpaw-keyring.h				\
 	tpaw-irc-network-chooser-dialog.h	\
 	tpaw-irc-network-chooser.h		\
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/tp-account-widgets/tpaw-contactinfo-utils.c
index aeb52dd0d..bb3ce966d 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/tp-account-widgets/tpaw-contactinfo-utils.c
@@ -21,7 +21,7 @@
  */
 
 #include "config.h"
-#include "empathy-contactinfo-utils.h"
+#include "tpaw-contactinfo-utils.h"
 
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
@@ -70,7 +70,7 @@ typedef struct
 {
   const gchar *field_name;
   const gchar *title;
-  EmpathyContactInfoFormatFunc format;
+  TpawContactInfoFormatFunc format;
 } InfoFieldData;
 
 /* keep this syncronised with info_field_data below */
@@ -132,7 +132,7 @@ static InfoParameterData info_parameter_data[] =
 };
 
 const char **
-empathy_contact_info_get_field_names (guint *nnames)
+tpaw_contact_info_get_field_names (guint *nnames)
 {
   if (nnames != NULL)
     *nnames = G_N_ELEMENTS (info_field_names) - 1;
@@ -141,9 +141,9 @@ empathy_contact_info_get_field_names (guint *nnames)
 }
 
 gboolean
-empathy_contact_info_lookup_field (const gchar *field_name,
+tpaw_contact_info_lookup_field (const gchar *field_name,
     const gchar **title,
-    EmpathyContactInfoFormatFunc *format)
+    TpawContactInfoFormatFunc *format)
 {
   guint i;
 
@@ -204,7 +204,7 @@ build_parameters_string (GStrv parameters)
 }
 
 char *
-empathy_contact_info_field_label (const char *field_name,
+tpaw_contact_info_field_label (const char *field_name,
     GStrv parameters,
     gboolean show_parameters)
 {
@@ -212,7 +212,7 @@ empathy_contact_info_field_label (const char *field_name,
   const char *title;
   char *join = NULL;
 
-  if (!empathy_contact_info_lookup_field (field_name, &title, NULL))
+  if (!tpaw_contact_info_lookup_field (field_name, &title, NULL))
     return NULL;
 
   if (show_parameters)
@@ -250,14 +250,14 @@ contact_info_field_name_cmp (const gchar *name1,
 }
 
 gint
-empathy_contact_info_field_cmp (TpContactInfoField *field1,
+tpaw_contact_info_field_cmp (TpContactInfoField *field1,
     TpContactInfoField *field2)
 {
   return contact_info_field_name_cmp (field1->field_name, field2->field_name);
 }
 
 gint
-empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
+tpaw_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
     TpContactInfoFieldSpec *spec2)
 {
     return contact_info_field_name_cmp (spec1->name, spec2->name);
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/tp-account-widgets/tpaw-contactinfo-utils.h
index 91c3a529b..ced81b191 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/tp-account-widgets/tpaw-contactinfo-utils.h
@@ -18,28 +18,28 @@
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#ifndef __EMPATHY_CONTACTINFO_UTILS_H__
-#define __EMPATHY_CONTACTINFO_UTILS_H__
+#ifndef __TPAW_CONTACTINFO_UTILS_H__
+#define __TPAW_CONTACTINFO_UTILS_H__
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
-typedef gchar * (* EmpathyContactInfoFormatFunc) (GStrv);
+typedef gchar * (* TpawContactInfoFormatFunc) (GStrv);
 
-const char **empathy_contact_info_get_field_names (guint *nnames);
-gboolean empathy_contact_info_lookup_field (const gchar *field_name,
-    const gchar **title, EmpathyContactInfoFormatFunc *linkify);
-char *empathy_contact_info_field_label (const char *field_name,
+const char **tpaw_contact_info_get_field_names (guint *nnames);
+gboolean tpaw_contact_info_lookup_field (const gchar *field_name,
+    const gchar **title, TpawContactInfoFormatFunc *linkify);
+char *tpaw_contact_info_field_label (const char *field_name,
     GStrv parameters,
     gboolean show_parameters);
 
-gint empathy_contact_info_field_cmp (TpContactInfoField *field1,
+gint tpaw_contact_info_field_cmp (TpContactInfoField *field1,
     TpContactInfoField *field2);
-gint empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
+gint tpaw_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
     TpContactInfoFieldSpec *spec2);
 
 G_END_DECLS
 
-#endif /*  __EMPATHY_UTILS_H__ */
+#endif /*  __TPAW_UTILS_H__ */