From d9f45de3b3da70e5d047313e0abb816d9f2fca3f Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Mon, 29 Jul 2013 10:28:48 +0100 Subject: contactinfo-utils: move create_channel_list_label to individual-widget This removed the dependency of contactinfo-utils on empathy-request-util.h, so it's easier to move tp tp-account-widgets. https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- libempathy-gtk/empathy-individual-widget.c | 68 +++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) (limited to 'libempathy-gtk/empathy-individual-widget.c') diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index bf0998ece..8910954f7 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -36,6 +36,7 @@ #include "empathy-groups-widget.h" #include "empathy-gtk-enum-types.h" #include "empathy-location.h" +#include "empathy-request-util.h" #include "empathy-ui-utils.h" #include "empathy-utils.h" @@ -219,6 +220,70 @@ add_row (GtkGrid *grid, gtk_widget_show (value); } +static gboolean +channel_name_activated_cb ( + GtkLabel *label, + gchar *uri, + TpAccount *account) +{ + empathy_join_muc (account, uri, empathy_get_current_action_time ()); + return TRUE; +} + +static GtkWidget * +create_channel_list_label (TpAccount *account, + GList *info, + guint row) +{ + GtkWidget *label = NULL; + GString *label_markup = g_string_new (""); + guint i; + GPtrArray *channels; + GList *l; + + /* Is there channels? */ + channels = g_ptr_array_new (); + + for (l = info; l != NULL; l = l->next) + { + TpContactInfoField *field = l->data; + + if (!tp_strdiff (field->field_name, "x-irc-channel")) + g_ptr_array_add (channels, (gpointer) field->field_value[0]); + } + + if (channels->len == 0) + goto out; + + for (i = 0; i < channels->len; i++) + { + const gchar *channel_name = g_ptr_array_index (channels, i); + /* We abuse the URI of the link to hold the channel name. It seems to + * be okay to just use it essentially verbatim, rather than trying to + * ensure it's actually a valid URI. */ + gchar *escaped = g_markup_escape_text (channel_name, -1); + + if (i > 0) + g_string_append (label_markup, ", "); + + g_string_append_printf (label_markup, "%s", + escaped, escaped); + g_free (escaped); + } + + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), label_markup->str); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + + g_signal_connect (label, "activate-link", + (GCallback) channel_name_activated_cb, account); + +out: + g_ptr_array_unref (channels); + g_string_free (label_markup, TRUE); + + return label; +} static guint details_update_show (EmpathyIndividualWidget *self, TpContact *contact) @@ -285,8 +350,7 @@ details_update_show (EmpathyIndividualWidget *self, conn = tp_contact_get_connection (contact); account = tp_connection_get_account (conn); - channels_label = empathy_contact_info_create_channel_list_label (account, - info, n_rows); + channels_label = create_channel_list_label (account, info, n_rows); if (channels_label != NULL) { -- cgit v1.2.3