fix build with nat api changes

2 files changed, 22 insertions, 15 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 057ed40d..0b3023d3 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -265,17 +265,19 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
 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);
 }
 
 
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 6064410c..445f680b 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -166,12 +166,11 @@ update_icmp_server_enable_button (int on)
  * 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 @@ result_callback (void *cls, int success,
   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 @@ reversal_test (void *cls,
               _("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 @@ test_online (struct GNUNET_SetupAutoContext *ac)
  *
  * @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];