From 45e5ffdb0c84f0026cf552fe885f06498eaddb39 Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Mon, 29 Jul 2013 14:12:14 +0100 Subject: contactinfo-utils: move from Empathy to tp-account-widgets https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- libempathy-gtk/Makefile.am | 2 - libempathy-gtk/empathy-contactinfo-utils.c | 265 ---------------------------- libempathy-gtk/empathy-contactinfo-utils.h | 45 ----- libempathy-gtk/empathy-individual-widget.c | 10 +- libempathy-gtk/empathy-user-info.c | 10 +- tp-account-widgets/Makefile.am | 2 + tp-account-widgets/tpaw-contactinfo-utils.c | 265 ++++++++++++++++++++++++++++ tp-account-widgets/tpaw-contactinfo-utils.h | 45 +++++ 8 files changed, 322 insertions(+), 322 deletions(-) delete mode 100644 libempathy-gtk/empathy-contactinfo-utils.c delete mode 100644 libempathy-gtk/empathy-contactinfo-utils.h create mode 100644 tp-account-widgets/tpaw-contactinfo-utils.c create mode 100644 tp-account-widgets/tpaw-contactinfo-utils.h 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-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c deleted file mode 100644 index aeb52dd0d..000000000 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright (C) 2007-2011 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens - * Philip Withnall - * Danielle Madeley - */ - -#include "config.h" -#include "empathy-contactinfo-utils.h" - -#include -#include -#include -#include - -static gchar * -linkify_first_value (GStrv values) -{ - return tpaw_add_link_markup (values[0]); -} - -static gchar * -format_idle_time (GStrv values) -{ - const gchar *value = values[0]; - int duration = strtol (value, NULL, 10); - - if (duration <= 0) - return NULL; - - return tpaw_duration_to_string (duration); -} - -static gchar * -format_server (GStrv values) -{ - g_assert (values[0] != NULL); - - if (values[1] == NULL) - return g_markup_escape_text (values[0], -1); - else - return g_markup_printf_escaped ("%s (%s)", values[0], values[1]); -} - -static gchar * -presence_hack (GStrv values) -{ - if (tp_str_empty (values[0])) - return NULL; - - return g_markup_escape_text (values[0], -1); -} - -typedef struct -{ - const gchar *field_name; - const gchar *title; - EmpathyContactInfoFormatFunc format; -} InfoFieldData; - -/* keep this syncronised with info_field_data below */ -static const char *info_field_names[] = -{ - "fn", - "tel", - "email", - "url", - "bday", - - "x-idle-time", - "x-irc-server", - "x-host", - - "x-presence-status-message", - - NULL -}; - -static InfoFieldData info_field_data[G_N_ELEMENTS (info_field_names)] = -{ - { "fn", N_("Full name"), NULL }, - { "tel", N_("Phone number"), NULL }, - { "email", N_("E-mail address"), linkify_first_value }, - { "url", N_("Website"), linkify_first_value }, - { "bday", N_("Birthday"), NULL }, - - /* Note to translators: this is the caption for a string of the form "5 - * minutes ago", and refers to the time since the contact last interacted - * with their IM client. */ - { "x-idle-time", N_("Last seen:"), format_idle_time }, - { "x-irc-server", N_("Server:"), format_server }, - { "x-host", N_("Connected from:"), format_server }, - - /* FIXME: once Idle implements SimplePresence using this information, we can - * and should bin this. */ - { "x-presence-status-message", N_("Away message:"), presence_hack }, - - { NULL, NULL } -}; - -typedef struct -{ - const gchar *type; - const gchar *title; -} InfoParameterData; - -static InfoParameterData info_parameter_data[] = -{ - { "work", N_("work") }, - { "home", N_("home") }, - { "cell", N_("mobile") }, - { "voice", N_("voice") }, - { "pref", N_("preferred") }, - { "postal", N_("postal") }, - { "parcel", N_("parcel") }, - { NULL, NULL } -}; - -const char ** -empathy_contact_info_get_field_names (guint *nnames) -{ - if (nnames != NULL) - *nnames = G_N_ELEMENTS (info_field_names) - 1; - - return info_field_names; -} - -gboolean -empathy_contact_info_lookup_field (const gchar *field_name, - const gchar **title, - EmpathyContactInfoFormatFunc *format) -{ - guint i; - - for (i = 0; info_field_data[i].field_name != NULL; i++) - { - if (tp_strdiff (info_field_data[i].field_name, field_name) == FALSE) - { - if (title != NULL) - *title = gettext (info_field_data[i].title); - - if (format != NULL) - *format = info_field_data[i].format; - - return TRUE; - } - } - - return FALSE; -} - -static char * -build_parameters_string (GStrv parameters) -{ - GPtrArray *output = g_ptr_array_new (); - char *join; - GStrv iter; - - for (iter = parameters; iter != NULL && *iter != NULL; iter++) - { - static const char *prefix = "type="; - const char *param = *iter; - InfoParameterData *iter2; - - if (!g_str_has_prefix (param, prefix)) - continue; - - param += strlen (prefix); - - for (iter2 = info_parameter_data; iter2->type != NULL; iter2++) - { - if (!tp_strdiff (iter2->type, param)) - { - g_ptr_array_add (output, gettext (iter2->title)); - break; - } - } - } - - if (output->len == 0) - return NULL; - - g_ptr_array_add (output, NULL); /* NULL-terminate */ - - join = g_strjoinv (", ", (char **) output->pdata); - g_ptr_array_unref (output); - - return join; -} - -char * -empathy_contact_info_field_label (const char *field_name, - GStrv parameters, - gboolean show_parameters) -{ - char *ret; - const char *title; - char *join = NULL; - - if (!empathy_contact_info_lookup_field (field_name, &title, NULL)) - return NULL; - - if (show_parameters) - join = build_parameters_string (parameters); - - if (join != NULL) - ret = g_strdup_printf ("%s (%s)", title, join); - else - ret = g_strdup_printf ("%s", title); - - g_free (join); - - return ret; -} - -static gint -contact_info_field_name_cmp (const gchar *name1, - const gchar *name2) -{ - guint i; - - if (tp_strdiff (name1, name2) == FALSE) - return 0; - - /* We use the order of info_field_data */ - for (i = 0; info_field_data[i].field_name != NULL; i++) - { - if (tp_strdiff (info_field_data[i].field_name, name1) == FALSE) - return -1; - if (tp_strdiff (info_field_data[i].field_name, name2) == FALSE) - return +1; - } - - return g_strcmp0 (name1, name2); -} - -gint -empathy_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, - TpContactInfoFieldSpec *spec2) -{ - return contact_info_field_name_cmp (spec1->name, spec2->name); -} - diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h deleted file mode 100644 index 91c3a529b..000000000 --- a/libempathy-gtk/empathy-contactinfo-utils.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2011 Collabora Ltd. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Danielle Madeley - */ - -#ifndef __EMPATHY_CONTACTINFO_UTILS_H__ -#define __EMPATHY_CONTACTINFO_UTILS_H__ - -#include -#include - -G_BEGIN_DECLS - -typedef gchar * (* EmpathyContactInfoFormatFunc) (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, - GStrv parameters, - gboolean show_parameters); - -gint empathy_contact_info_field_cmp (TpContactInfoField *field1, - TpContactInfoField *field2); -gint empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1, - TpContactInfoFieldSpec *spec2); - -G_END_DECLS - -#endif /* __EMPATHY_UTILS_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 #include +#include #include #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 #include +#include #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/tp-account-widgets/tpaw-contactinfo-utils.c b/tp-account-widgets/tpaw-contactinfo-utils.c new file mode 100644 index 000000000..bb3ce966d --- /dev/null +++ b/tp-account-widgets/tpaw-contactinfo-utils.c @@ -0,0 +1,265 @@ +/* + * Copyright (C) 2007-2011 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Xavier Claessens + * Philip Withnall + * Danielle Madeley + */ + +#include "config.h" +#include "tpaw-contactinfo-utils.h" + +#include +#include +#include +#include + +static gchar * +linkify_first_value (GStrv values) +{ + return tpaw_add_link_markup (values[0]); +} + +static gchar * +format_idle_time (GStrv values) +{ + const gchar *value = values[0]; + int duration = strtol (value, NULL, 10); + + if (duration <= 0) + return NULL; + + return tpaw_duration_to_string (duration); +} + +static gchar * +format_server (GStrv values) +{ + g_assert (values[0] != NULL); + + if (values[1] == NULL) + return g_markup_escape_text (values[0], -1); + else + return g_markup_printf_escaped ("%s (%s)", values[0], values[1]); +} + +static gchar * +presence_hack (GStrv values) +{ + if (tp_str_empty (values[0])) + return NULL; + + return g_markup_escape_text (values[0], -1); +} + +typedef struct +{ + const gchar *field_name; + const gchar *title; + TpawContactInfoFormatFunc format; +} InfoFieldData; + +/* keep this syncronised with info_field_data below */ +static const char *info_field_names[] = +{ + "fn", + "tel", + "email", + "url", + "bday", + + "x-idle-time", + "x-irc-server", + "x-host", + + "x-presence-status-message", + + NULL +}; + +static InfoFieldData info_field_data[G_N_ELEMENTS (info_field_names)] = +{ + { "fn", N_("Full name"), NULL }, + { "tel", N_("Phone number"), NULL }, + { "email", N_("E-mail address"), linkify_first_value }, + { "url", N_("Website"), linkify_first_value }, + { "bday", N_("Birthday"), NULL }, + + /* Note to translators: this is the caption for a string of the form "5 + * minutes ago", and refers to the time since the contact last interacted + * with their IM client. */ + { "x-idle-time", N_("Last seen:"), format_idle_time }, + { "x-irc-server", N_("Server:"), format_server }, + { "x-host", N_("Connected from:"), format_server }, + + /* FIXME: once Idle implements SimplePresence using this information, we can + * and should bin this. */ + { "x-presence-status-message", N_("Away message:"), presence_hack }, + + { NULL, NULL } +}; + +typedef struct +{ + const gchar *type; + const gchar *title; +} InfoParameterData; + +static InfoParameterData info_parameter_data[] = +{ + { "work", N_("work") }, + { "home", N_("home") }, + { "cell", N_("mobile") }, + { "voice", N_("voice") }, + { "pref", N_("preferred") }, + { "postal", N_("postal") }, + { "parcel", N_("parcel") }, + { NULL, NULL } +}; + +const char ** +tpaw_contact_info_get_field_names (guint *nnames) +{ + if (nnames != NULL) + *nnames = G_N_ELEMENTS (info_field_names) - 1; + + return info_field_names; +} + +gboolean +tpaw_contact_info_lookup_field (const gchar *field_name, + const gchar **title, + TpawContactInfoFormatFunc *format) +{ + guint i; + + for (i = 0; info_field_data[i].field_name != NULL; i++) + { + if (tp_strdiff (info_field_data[i].field_name, field_name) == FALSE) + { + if (title != NULL) + *title = gettext (info_field_data[i].title); + + if (format != NULL) + *format = info_field_data[i].format; + + return TRUE; + } + } + + return FALSE; +} + +static char * +build_parameters_string (GStrv parameters) +{ + GPtrArray *output = g_ptr_array_new (); + char *join; + GStrv iter; + + for (iter = parameters; iter != NULL && *iter != NULL; iter++) + { + static const char *prefix = "type="; + const char *param = *iter; + InfoParameterData *iter2; + + if (!g_str_has_prefix (param, prefix)) + continue; + + param += strlen (prefix); + + for (iter2 = info_parameter_data; iter2->type != NULL; iter2++) + { + if (!tp_strdiff (iter2->type, param)) + { + g_ptr_array_add (output, gettext (iter2->title)); + break; + } + } + } + + if (output->len == 0) + return NULL; + + g_ptr_array_add (output, NULL); /* NULL-terminate */ + + join = g_strjoinv (", ", (char **) output->pdata); + g_ptr_array_unref (output); + + return join; +} + +char * +tpaw_contact_info_field_label (const char *field_name, + GStrv parameters, + gboolean show_parameters) +{ + char *ret; + const char *title; + char *join = NULL; + + if (!tpaw_contact_info_lookup_field (field_name, &title, NULL)) + return NULL; + + if (show_parameters) + join = build_parameters_string (parameters); + + if (join != NULL) + ret = g_strdup_printf ("%s (%s)", title, join); + else + ret = g_strdup_printf ("%s", title); + + g_free (join); + + return ret; +} + +static gint +contact_info_field_name_cmp (const gchar *name1, + const gchar *name2) +{ + guint i; + + if (tp_strdiff (name1, name2) == FALSE) + return 0; + + /* We use the order of info_field_data */ + for (i = 0; info_field_data[i].field_name != NULL; i++) + { + if (tp_strdiff (info_field_data[i].field_name, name1) == FALSE) + return -1; + if (tp_strdiff (info_field_data[i].field_name, name2) == FALSE) + return +1; + } + + return g_strcmp0 (name1, name2); +} + +gint +tpaw_contact_info_field_cmp (TpContactInfoField *field1, + TpContactInfoField *field2) +{ + return contact_info_field_name_cmp (field1->field_name, field2->field_name); +} + +gint +tpaw_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1, + TpContactInfoFieldSpec *spec2) +{ + return contact_info_field_name_cmp (spec1->name, spec2->name); +} + diff --git a/tp-account-widgets/tpaw-contactinfo-utils.h b/tp-account-widgets/tpaw-contactinfo-utils.h new file mode 100644 index 000000000..ced81b191 --- /dev/null +++ b/tp-account-widgets/tpaw-contactinfo-utils.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2011 Collabora Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Authors: Danielle Madeley + */ + +#ifndef __TPAW_CONTACTINFO_UTILS_H__ +#define __TPAW_CONTACTINFO_UTILS_H__ + +#include +#include + +G_BEGIN_DECLS + +typedef gchar * (* TpawContactInfoFormatFunc) (GStrv); + +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 tpaw_contact_info_field_cmp (TpContactInfoField *field1, + TpContactInfoField *field2); +gint tpaw_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1, + TpContactInfoFieldSpec *spec2); + +G_END_DECLS + +#endif /* __TPAW_UTILS_H__ */ -- cgit v1.2.3