[GNUnet-SVN] r33429 - in gnunet-gtk/src: conversation setup

[gnunet]

Author: grothoff
Date: 2014-05-27 22:37:37 +0200 (Tue, 27 May 2014)
New Revision: 33429

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
   gnunet-gtk/src/setup/gnunet-setup-transport.c
Log:
fix build with nat api changes


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-05-27 18:46:41 UTC (rev 33428)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-05-27 20:37:37 UTC (rev 33429)
@@ -265,17 +265,19 @@
 void
 GCG_CONTACTS_init ()
 {
+#if GTK_CHECK_VERSION(3,10,0)
   GtkTreeView *contacts_treeview;
 
+  contacts_treeview
+    = GTK_TREE_VIEW (GCG_get_main_window_object 
("gnunet_conversation_gtk_treeview"));
+  gtk_tree_view_set_activate_on_single_click (contacts_treeview,
+                                              TRUE);
+#endif
   contacts_liststore
     = GTK_LIST_STORE (GCG_get_main_window_object
                       ("gnunet_conversation_gtk_contacts_liststore"));
   contacts_treemodel
     = GTK_TREE_MODEL (contacts_liststore);
-  contacts_treeview
-    = GTK_TREE_VIEW (GCG_get_main_window_object 
("gnunet_conversation_gtk_treeview"));
-  gtk_tree_view_set_activate_on_single_click (contacts_treeview,
-                                              TRUE);
 }
 
 

Modified: gnunet-gtk/src/setup/gnunet-setup-transport.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-05-27 18:46:41 UTC 
(rev 33428)
+++ gnunet-gtk/src/setup/gnunet-setup-transport.c       2014-05-27 20:37:37 UTC 
(rev 33429)
@@ -166,12 +166,11 @@
  * Clean up and update GUI (with success).
  *
  * @param cls closure (unused)
- * @param success currently always #GNUNET_OK
- * @param emsg error message, NULL on success
+ * @param result error status
  */
 static void
-result_callback (void *cls, int success,
-                 const char *emsg)
+result_callback (void *cls, 
+                 enum GNUNET_NAT_FailureCode result)
 {
   struct GNUNET_SetupAutoContext *ac = cls;
 
@@ -180,13 +179,16 @@
   GNUNET_NAT_test_stop (ac->tst);
   ac->tst = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             success
+             (GNUNET_NAT_ERROR_SUCCESS == result)
              ? _("NAT traversal with ICMP Server succeeded.\n")
              : _("NAT traversal with ICMP Server failed.\n"));
-  update_icmp_server_enable_button (success);
+  update_icmp_server_enable_button ((GNUNET_NAT_ERROR_SUCCESS == result));
   if (NULL != cfg)
-    GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER",
-                                          success ? "YES": "NO");
+    GNUNET_CONFIGURATION_set_value_string (cfg, 
+                                          "nat",
+                                          "ENABLE_ICMP_SERVER",
+                                          (GNUNET_NAT_ERROR_SUCCESS == result)
+                                          ? "YES": "NO");
   next_phase (ac);
 }
 
@@ -233,7 +235,10 @@
              _("Testing connection reversal with ICMP server.\n"));
   GNUNET_assert (NULL != cfg);
   GNUNET_RESOLVER_connect (cfg);
-  ac->tst = GNUNET_NAT_test_start (cfg, GNUNET_YES, 0, 0, &result_callback, 
ac);
+  ac->tst = GNUNET_NAT_test_start (cfg,
+                                  GNUNET_YES,
+                                  0, 0, 
+                                  &result_callback, ac);
   if (NULL == ac->tst)
   {
     next_phase (ac);
@@ -261,12 +266,12 @@
  *
  * @param cls closure with our setup context
  * @param addr the address, NULL on errors
- * @param emsg error message, NULL on success
+ * @param result error code
  */
 static void
 set_external_ipv4 (void *cls,
                    const struct in_addr *addr,
-                   const char *emsg)
+                   enum GNUNET_NAT_FailureCode result)
 {
   struct GNUNET_SetupAutoContext *ac = cls;
   char buf[INET_ADDRSTRLEN];