diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-29 21:12:14 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
commit | 45e5ffdb0c84f0026cf552fe885f06498eaddb39 (patch) | |
tree | 8cef239f954c6cc762cb6dc7bcfd28efbcc78107 /libempathy-gtk/empathy-individual-widget.c | |
parent | c1f785d53882e5d06bdcf3692d1002e1607e4259 (diff) | |
download | gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar.gz gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar.bz2 gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar.lz gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar.xz gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.tar.zst gsoc2013-empathy-45e5ffdb0c84f0026cf552fe885f06498eaddb39.zip |
contactinfo-utils: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |