messenger-gtk

commit 03cfa31ddd0c86e654a7843b3827416dc40e23fd
parent 0df8809142089441c820b27e2fd653ed0c3bc757
Author: Jacki <jacki@thejackimonster.de>
Date:   Tue, 23 Apr 2024 00:35:08 +0200

Merge duplicate contact attributes

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
M
src/ui/contact_info.c
 | 
57
+++++++++++++++++++++++++++++++++++++++++++++++----------

1 file changed, 47 insertions(+), 10 deletions(-)
diff --git a/src/ui/contact_info.c b/src/ui/contact_info.c
@@ -519,16 +519,53 @@ cb_contact_info_contact_attributes(void *cls,
 
   UI_CONTACT_INFO_Handle *handle = (UI_CONTACT_INFO_Handle*) cls;
 
-  gtk_list_store_insert_with_values(
-    handle->attributes_list,
-    NULL,
-    -1,
-    0,
-    name,
-    1,
-    value,
-    -1
-  );
+  GtkTreeModel *model = GTK_TREE_MODEL(handle->attributes_list);
+  GtkTreeIter iter;
+
+  GValue val_name = G_VALUE_INIT;
+  GValue val_value = G_VALUE_INIT;
+
+  gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
+  gboolean match = FALSE;
+
+  while (valid)
+  {
+    gtk_tree_model_get_value(model, &iter, 0, &val_name);
+    gtk_tree_model_get_value(model, &iter, 1, &val_value);
+    
+    if (0 == strcmp(g_value_get_string(&val_name), name))
+    {
+      gtk_list_store_set(
+        handle->attributes_list,
+        &iter,
+        1,
+        g_value_get_string(&val_value),
+        -1
+      );
+      
+      match = TRUE;
+    }
+
+    g_value_unset(&val_name);
+    g_value_unset(&val_value);
+
+    if (match)
+      break;
+
+    valid = gtk_tree_model_iter_next(model, &iter);
+  }
+
+  if (!match)
+    gtk_list_store_insert_with_values(
+      handle->attributes_list,
+      NULL,
+      -1,
+      0,
+      name,
+      1,
+      value,
+      -1
+    );
 
   return GNUNET_YES;
 }