1 files changed, 65 insertions, 11 deletions

diff --git a/src/peerinfo/gnunet-peerinfo-gtk.c b/src/peerinfo/gnunet-peerinfo-gtk.c
index 2a633d33..286a8895 100644
--- a/src/peerinfo/gnunet-peerinfo-gtk.c
+++ b/src/peerinfo/gnunet-peerinfo-gtk.c
@@ -31,6 +31,48 @@
 
 
 /**
+ * Columns in the peerinfo model.
+ */
+enum PEERINFO_ModelColumns
+  {
+    /**
+     * A gchararray 
+     */
+    PEERINFO_MC_PEER_IDENTITY_STRING = 0,
+
+    /**
+     * A guint
+     */
+    PEERINFO_MC_NUMBER_OF_ADDRESSES = 1,
+
+    /**
+     * A gchararray
+     */
+    PEERINFO_MC_COUNTRY_NAME = 2,
+
+    /**
+     * A GdkPixbuf
+     */
+    PEERINFO_MC_COUNTRY_FLAG = 3,
+
+    /**
+     * A guint64
+     */
+    PEERINFO_MC_BANDWIDTH_IN = 4,
+
+    /**
+     * A guint64
+     */
+    PEERINFO_MC_BANDWIDTH_OUT = 5,
+
+    /**
+     * A gchararray
+     */
+    PEERINFO_MC_ADDRESS_AS_STRING = 6
+  };
+
+
+/**
  * Information we track for each peer outside of the model.
  */
 struct PeerInfo
@@ -186,7 +228,12 @@ peer_address_string_cb (void *cls, const char *address)
   if (NULL == address)
   {
     /* error */
-    gtk_list_store_set (ls, &iter, 1, 1, 2, NULL, 3, NULL, 6, "<error>", -1);
+    gtk_list_store_set (ls, &iter, 
+                        PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 1, 
+                        PEERINFO_MC_COUNTRY_NAME, NULL, 
+                        PEERINFO_MC_COUNTRY_FLAG, NULL, 
+                        PEERINFO_MC_ADDRESS_AS_STRING, "<error>", 
+                        -1);
   }
   else
   {
@@ -234,7 +281,11 @@ peer_address_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
     GNUNET_assert (NULL != path);
     GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &iter, path));
     gtk_tree_path_free (path);
-    gtk_list_store_set (ls, &iter, 1, 0, 2, NULL, 3, NULL, 6, "<disconnected>",
+    gtk_list_store_set (ls, &iter, 
+                        PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 0,
+                        PEERINFO_MC_COUNTRY_NAME, NULL, 
+                        PEERINFO_MC_COUNTRY_FLAG, NULL, 
+                        PEERINFO_MC_ADDRESS_AS_STRING, "<disconnected>",
                         -1);
     return;
   }
@@ -283,13 +334,14 @@ peerinfo_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
     npid = (char *) &enc;
     npid[4] = '\0';
     gtk_list_store_append (ls, &iter);
-    gtk_list_store_set (ls, &iter, 0, npid, 1,
-                        0 /* number of known addresses */ ,
-                        2, "" /* country name */ ,
-                        3, NULL /* country flag */ ,
-                        4, (guint64) 0 /* bandwidth-in */ ,
-                        5, (guint64) 0 /* bandwidth-out */ ,
-                        6, "" /* addresses as strings */ ,
+    gtk_list_store_set (ls, &iter, 
+                        PEERINFO_MC_PEER_IDENTITY_STRING, npid, 
+                        PEERINFO_MC_NUMBER_OF_ADDRESSES, (guint) 0,
+                        PEERINFO_MC_COUNTRY_NAME, "",
+                        PEERINFO_MC_COUNTRY_FLAG, NULL,
+                        PEERINFO_MC_BANDWIDTH_IN, (guint64) 0,
+                        PEERINFO_MC_BANDWIDTH_OUT, (guint64) 0,
+                        PEERINFO_MC_ADDRESS_AS_STRING, "",
                         -1);
     path = gtk_tree_model_get_path (tm, &iter);
     info = GNUNET_malloc (sizeof (struct PeerInfo));
@@ -344,8 +396,10 @@ status_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
   GNUNET_assert (NULL != path);
   GNUNET_assert (TRUE == gtk_tree_model_get_iter (tm, &iter, path));
   gtk_tree_path_free (path);
-  gtk_list_store_set (ls, &iter, 4, (guint64) ntohl (bandwidth_in.value__), 5,
-                      (guint64) ntohl (bandwidth_out.value__), -1);
+  gtk_list_store_set (ls, &iter,
+                      PEERINFO_MC_BANDWIDTH_IN, (guint64) ntohl (bandwidth_in.value__),
+                      PEERINFO_MC_BANDWIDTH_OUT, (guint64) ntohl (bandwidth_out.value__),
+                      -1);
 }
 #endif