[GNUnet-SVN] r31412 - in gnunet-gtk: contrib src/peerinfo

[gnunet]

Author: grothoff
Date: 2013-12-16 15:10:12 +0100 (Mon, 16 Dec 2013)
New Revision: 31412

Modified:
   gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
   gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
-use 32-bit for bandwidth values, Gtk hates us otherwise

Modified: gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade    2013-12-16 
13:54:11 UTC (rev 31411)
+++ gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade    2013-12-16 
14:10:12 UTC (rev 31412)
@@ -13,9 +13,9 @@
       <!-- column-name country_flag -->
       <column type="GdkPixbuf"/>
       <!-- column-name bandwidth_in -->
-      <column type="guint64"/>
+      <column type="guint"/>
       <!-- column-name bandwidth_out -->
-      <column type="guint64"/>
+      <column type="guint"/>
       <!-- column-name addresses -->
       <column type="gchararray"/>
       <!-- column-name connectivity_led -->

Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2013-12-16 13:54:11 UTC 
(rev 31411)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c       2013-12-16 14:10:12 UTC 
(rev 31412)
@@ -327,12 +327,13 @@
 /**
  * Function to call with a binary format of an address
  *
- * @param cls the 'struct PeerInfo' for which this is a valid address
+ * @param cls the `struct PeerInfo` for which this is a valid address
  * @param peer peer the update is about
  * @param address NULL on disconnect, otherwise 0-terminated printable UTF-8 
string
  */
 static void
-peer_address_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
+peer_address_cb (void *cls,
+                 const struct GNUNET_PeerIdentity *peer,
                  const struct GNUNET_HELLO_Address *address)
 {
   struct PeerInfo *info = cls;
@@ -378,7 +379,8 @@
  * @param err_msg NULL if successful, otherwise contains error message
  */
 static void
-peerinfo_processor (void *cls, const struct GNUNET_PeerIdentity *peer,
+peerinfo_processor (void *cls,
+                    const struct GNUNET_PeerIdentity *peer,
                     const struct GNUNET_HELLO_Message *hello,
                     const char *err_msg)
 {
@@ -434,7 +436,7 @@
  * @param bandwidth_in available amount of inbound bandwidth
  * @param bandwidth_out available amount of outbound bandwidth
  * @param ats performance data for the address (as far as known)
- * @param ats_count number of performance records in 'ats'
+ * @param ats_count number of performance records in @a ats
  */
 static void
 status_cb (void *cls,
@@ -459,8 +461,8 @@
   GNUNET_assert (TRUE == gtk_tree_model_get_iter (GTK_TREE_MODEL (ls), &iter, 
path));
   gtk_tree_path_free (path);
   gtk_list_store_set (ls, &iter,
-                     PEERINFO_MC_BANDWIDTH_IN, (guint64) ntohl 
(bandwidth_in.value__),
-                     PEERINFO_MC_BANDWIDTH_OUT, (guint64) ntohl 
(bandwidth_out.value__),
+                     PEERINFO_MC_BANDWIDTH_IN, (guint) ntohl 
(bandwidth_in.value__),
+                     PEERINFO_MC_BANDWIDTH_OUT, (guint) ntohl 
(bandwidth_out.value__),
                      -1);
 }