1 files changed, 3 insertions, 20 deletions

diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index 6355fcd..3741768 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -149,24 +149,15 @@ handle_dialog_destroy(UNUSED GtkWidget *window,
 }
 
 static int
-_iterate_clear_contacts(UNUSED void *cls,
-                        UNUSED struct GNUNET_CHAT_Handle *handle,
-                        struct GNUNET_CHAT_Contact *contact)
-{
-  GNUNET_CHAT_contact_set_user_pointer(contact, NULL);
-  return GNUNET_YES;
-}
-
-static int
 _iterate_contacts(void *cls,
                   UNUSED struct GNUNET_CHAT_Handle *handle,
                   struct GNUNET_CHAT_Contact *contact)
 {
-  MESSENGER_Application *app = (MESSENGER_Application*) cls;
-
-  if (GNUNET_CHAT_contact_get_user_pointer(contact))
+  if (GNUNET_YES == GNUNET_CHAT_contact_is_owned(contact))
     return GNUNET_YES;
 
+  MESSENGER_Application *app = (MESSENGER_Application*) cls;
+
   const char *title;
   title = GNUNET_CHAT_contact_get_name(contact);
 
@@ -178,8 +169,6 @@ _iterate_contacts(void *cls,
       entry->entry_box
   );
 
-  GNUNET_CHAT_contact_set_user_pointer(contact, entry);
-
   if (title)
   {
     gtk_label_set_text(entry->title_label, title);
@@ -324,12 +313,6 @@ ui_new_group_dialog_init(MESSENGER_Application *app,
 
   GNUNET_CHAT_iterate_contacts(
       app->chat.messenger.handle,
-      _iterate_clear_contacts,
-      NULL
-  );
-
-  GNUNET_CHAT_iterate_contacts(
-      app->chat.messenger.handle,
       _iterate_contacts,
       app
   );