[GNUnet-SVN] r4949 - gnunet-gtk/src/plugins/peers

[gnunet]

Author: grothoff
Date: 2007-06-08 01:45:03 -0600 (Fri, 08 Jun 2007)
New Revision: 4949

Modified:
   gnunet-gtk/src/plugins/peers/peers.c
Log:
prefer HELLOs with address

Modified: gnunet-gtk/src/plugins/peers/peers.c
===================================================================
--- gnunet-gtk/src/plugins/peers/peers.c        2007-06-08 07:16:39 UTC (rev 
4948)
+++ gnunet-gtk/src/plugins/peers/peers.c        2007-06-08 07:45:03 UTC (rev 
4949)
@@ -64,27 +64,37 @@
   char * fn;
   char * prefix;
   char * have;
+  char * haddress;
   cron_t now;
+  int found;
 
   hash2enc(&identity->hashPubKey,
           &enc);
   /* check if same peer is already in model! */
+  found = NO;
   if (TRUE == gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
                                            &iter)) {
     do {
       gtk_tree_model_get(GTK_TREE_MODEL(model),
                         &iter,
+                        0, &haddress,
                         3, &have,
                         -1);
       if (have != NULL) {
        if (0 == strcmp(have, (char*) &enc)) {
-         FREE(have);
-         return OK;
+         if (strlen(haddress) > 0) {
+           FREE(have);
+           FREE(haddress);
+           return OK;
+         }
+         found = YES;
        }
+       FREE(haddress);
        FREE(have);
       }
-    } while (TRUE == gtk_tree_model_iter_next(GTK_TREE_MODEL(model),
-                                             &iter));
+    } while ( (found == NO) &&
+             (TRUE == gtk_tree_model_iter_next(GTK_TREE_MODEL(model),
+                                               &iter)) );
   }
 
 
@@ -144,8 +154,9 @@
     g_object_ref(ledBuf);
 
   /* add to model */
-  gtk_list_store_append(model,
-                       &iter);
+  if (found == NO)
+    gtk_list_store_append(model,
+                         &iter);
   gtk_list_store_set(model,
                     &iter,
                     0, address,