[GNUnet-SVN] r33094 - gnunet-gtk/src/peerinfo

[gnunet]

Author: grothoff
Date: 2014-04-16 11:41:08 +0200 (Wed, 16 Apr 2014)
New Revision: 33094

Modified:
   gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
use more colors for validation status engine as well

Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2014-04-16 09:35:10 UTC 
(rev 33093)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2014-04-16 09:41:08 UTC 
(rev 33094)
@@ -917,7 +917,7 @@
   gboolean con;
   const char *tos;
   struct PeerAddress *pa;
-  static GdkPixbuf *led;
+  GdkPixbuf *led;
 
   if (NULL == peer)
   {
@@ -1040,7 +1040,7 @@
  * @param last_validation when was this address last validated
  * @param valid_until when does this address expire
  * @param next_validation time of the next validation operation
- * @param state state in the validation state machine (FIXME: not used yet)
+ * @param state state in the validation state machine
  */
 static void
 validation_monitor_cb (void *cts,
@@ -1056,6 +1056,7 @@
   GtkTreeIter iter;
   const char *tos;
   gboolean valid;
+  GdkPixbuf *led;
 
   if (NULL == peer)
   {
@@ -1065,6 +1066,24 @@
                                            NULL);
     return;
   }
+  switch (state)
+  {
+  case GNUNET_TRANSPORT_VS_NONE:
+    led = led_black;
+    break;
+  case GNUNET_TRANSPORT_VS_NEW:
+    led = led_yellow;
+    break;
+  case GNUNET_TRANSPORT_VS_UPDATE:
+    led = led_blue;
+    break;
+  case GNUNET_TRANSPORT_VS_TIMEOUT:
+    led = led_red;
+    break;
+  case GNUNET_TRANSPORT_VS_REMOVE:
+    led = NULL;
+    break;
+  }
   info = get_peer_info (peer);
   if (NULL == address)
   {
@@ -1080,14 +1099,16 @@
     }
     return;
   }
-  valid = GNUNET_TIME_absolute_get_remaining (valid_until).rel_value_us > 0;
+  valid = (GNUNET_TIME_absolute_get_remaining (valid_until).rel_value_us > 0);
+  if (valid)
+    led = led_green; /* UGH: should this not be indicated by 'state' somehow? 
*/
   pa = get_address (info, address);
   get_iter_from_rr (pa->rr, &iter);
   tos = GNUNET_STRINGS_absolute_time_to_string (valid_until);
   gtk_tree_store_set (ts, &iter,
                       PEERINFO_MC_VALIDATION_IS_VALID, valid,
                       PEERINFO_MC_VALIDATION_TIMEOUT_AS_STRING, tos,
-                      PEERINFO_MC_VALIDATION_STATE_LED, (valid ? led_green : 
led_red),
+                      PEERINFO_MC_VALIDATION_STATE_LED, led,
                       -1);
 }