#include "empathy-groups-widget.h"
#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
-#include "empathy-kludge-label.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include <libempathy/empathy-debug.h>
COL_COUNT
};
+static gboolean
+field_value_is_empty (TpContactInfoField *field)
+{
+ guint i;
+
+ if (field->field_value == NULL)
+ return TRUE;
+
+ /* Field is empty if all its values are empty */
+ for (i = 0; field->field_value[i] != NULL; i++)
+ {
+ if (!tp_str_empty (field->field_value[i]))
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void
+set_contact_info_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ GError *error = NULL;
+
+ if (!tp_connection_set_contact_info_finish (TP_CONNECTION (source), result,
+ &error))
+ {
+ DEBUG ("SetContactInfo() failed: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ DEBUG ("SetContactInfo() succeeded");
+}
+
static void
contact_widget_save (EmpathyContactWidget *information)
{
TpContactInfoField *field = l->data;
next = l->next;
- if (field->field_value == NULL || EMP_STR_EMPTY (field->field_value[0]))
+ if (field_value_is_empty (field))
{
DEBUG ("Drop empty field: %s", field->field_name);
tp_contact_info_field_free (field);
if (information->details_to_set != NULL)
{
tp_connection_set_contact_info_async (connection,
- information->details_to_set, NULL, NULL);
+ information->details_to_set, set_contact_info_cb, NULL);
tp_contact_info_list_free (information->details_to_set);
information->details_to_set = NULL;
}
return contact_info_field_name_cmp (field1->field_name, field2->field_name);
}
-static gint
-contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
- TpContactInfoFieldSpec *spec2)
+static gboolean
+field_name_in_field_list (GList *list,
+ const gchar *name)
{
- return contact_info_field_name_cmp (spec1->name, spec2->name);
+ GList *l;
+
+ for (l = list; l != NULL; l = g_list_next (l))
+ {
+ TpContactInfoField *field = l->data;
+
+ if (!tp_strdiff (field->field_name, name))
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static TpContactInfoFieldSpec *
+get_spec_from_list (GList *list,
+ const gchar *name)
+{
+ GList *l;
+
+ for (l = list; l != NULL; l = g_list_next (l))
+ {
+ TpContactInfoFieldSpec *spec = l->data;
+
+ if (!tp_strdiff (spec->name, name))
+ return spec;
+ }
+
+ return NULL;
}
static guint
GList *specs, *l;
guint n_rows = 0;
GList *info;
+ guint i;
g_assert (information->details_to_set == NULL);
contact = empathy_contact_get_tp_contact (information->contact);
connection = tp_contact_get_connection (contact);
+
info = tp_contact_get_contact_info (contact);
specs = tp_connection_get_contact_info_supported_fields (connection);
- specs = g_list_sort (specs, (GCompareFunc) contact_info_field_spec_cmp);
- for (l = specs; l != NULL; l = l->next)
+
+ /* Look at the fields set in our vCard */
+ for (l = info; l != NULL; l = l->next)
{
- TpContactInfoFieldSpec *spec = l->data;
+ TpContactInfoField *field = l->data;
+
+ /* make a copy for the details_to_set list */
+ field = tp_contact_info_field_copy (field);
+ DEBUG ("Field %s is in our vCard", field->field_name);
+
+ information->details_to_set = g_list_prepend (information->details_to_set,
+ field);
+ }
+
+ /* Add fields which are supported but not in the vCard */
+ for (i = 0; info_field_datas[i].field_name != NULL; i++)
+ {
+ TpContactInfoFieldSpec *spec;
TpContactInfoField *field;
+
+ /* Check if the field was in the vCard */
+ if (field_name_in_field_list (information->details_to_set,
+ info_field_datas[i].field_name))
+ continue;
+
+ /* Check if the CM supports the field */
+ spec = get_spec_from_list (specs, info_field_datas[i].field_name);
+ if (spec == NULL)
+ continue;
+
+ /* add an empty field so user can set a value */
+ field = tp_contact_info_field_new (spec->name, spec->parameters, NULL);
+
+ information->details_to_set = g_list_prepend (information->details_to_set,
+ field);
+ }
+
+ /* Add widgets for supported fields */
+ information->details_to_set = g_list_sort (information->details_to_set,
+ (GCompareFunc) contact_info_field_cmp);
+
+ for (l = information->details_to_set; l != NULL; l= g_list_next (l))
+ {
+ TpContactInfoField *field = l->data;
InfoFieldData *field_data;
- GList *ll;
- GStrv value = NULL;
GtkWidget *w;
- field_data = find_info_field_data (spec->name);
+ field_data = find_info_field_data (field->field_name);
if (field_data == NULL)
{
- DEBUG ("Unhandled ContactInfo field spec: %s", spec->name);
+ /* Empathy doesn't display this field so we can't change it.
+ * But we put it in the details_to_set list so it won't be erased
+ * when calling SetContactInfo (bgo #630427) */
+ DEBUG ("Unhandled ContactInfo field spec: %s", field->field_name);
continue;
}
- /* Search initial value */
- for (ll = info; ll != NULL; ll = ll->next)
- {
- field = ll->data;
- if (!tp_strdiff (field->field_name, spec->name))
- {
- value = field->field_value;
- break;
- }
- }
-
- field = tp_contact_info_field_new (spec->name, spec->parameters, value);
- information->details_to_set = g_list_prepend (information->details_to_set,
- field);
-
/* Add Title */
w = gtk_label_new (_(field_data->title));
gtk_table_attach (GTK_TABLE (information->table_details),
n_rows++;
}
+
g_list_free (specs);
g_list_free (info);
FolksPersona *persona =
empathy_contact_get_persona (information->contact);
- if (FOLKS_IS_GROUPS (persona))
+ if (FOLKS_IS_GROUPABLE (persona))
{
empathy_groups_widget_set_groupable (
EMPATHY_GROUPS_WIDGET (information->groups_widget),
- FOLKS_GROUPS (persona));
+ FOLKS_GROUPABLE (persona));
gtk_widget_show (information->groups_widget);
return;
static void
contact_widget_contact_setup (EmpathyContactWidget *information)
{
- /* Setup label_status as a KludgeLabel */
- information->label_status = empathy_kludge_label_new ("");
+ information->label_status = gtk_label_new ("");
gtk_label_set_line_wrap_mode (GTK_LABEL (information->label_status),
PANGO_WRAP_WORD_CHAR);
gtk_label_set_line_wrap (GTK_LABEL (information->label_status),
projects / empathy.git / blobdiff