[GNUnet-SVN] r37342 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2016-06-24 13:37:21 +0200 (Fri, 24 Jun 2016)
New Revision: 37342

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
Log:
update code to reflect recent API changes

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2016-06-24 09:15:24 UTC (rev 37341)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2016-06-24 11:37:21 UTC (rev 37342)
@@ -44,7 +44,6 @@
  */
 #define DEFAULT_MAX_PARALLEL_DOWNLOADS 128
 
-#define SERVICE_LIST_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)
 
 /**
  * The GNUNET_GTK_file_sharing_downloads_tree_store with the
@@ -257,12 +256,12 @@
   }
   if (NULL != armon)
   {
-    GNUNET_ARM_monitor_disconnect_and_free (armon);
+    GNUNET_ARM_monitor_stop (armon);
     armon = NULL;
   }
   if (NULL != arm)
   {
-    GNUNET_ARM_disconnect_and_free (arm);
+    GNUNET_ARM_disconnect (arm);
     arm = NULL;
   }
   GNUNET_FS_GTK_close_uri_tab_ ();
@@ -539,7 +538,7 @@
     service_list = format_service_list (0, NULL);
     GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list);
     GNUNET_free_non_null (service_list);
-    GNUNET_ARM_request_service_list (arm, SERVICE_LIST_TIMEOUT,
+    GNUNET_ARM_request_service_list (arm,
                                     &service_list_callback, cls);
   }
   else
@@ -559,7 +558,6 @@
    * without requesting a list from ARM every goddamned time?
    */
   GNUNET_ARM_request_service_list (arm,
-                                  SERVICE_LIST_TIMEOUT,
                                   &service_list_callback, cls);
 }
 
@@ -801,9 +799,9 @@
   arm = GNUNET_ARM_connect (main_context.cfg,
                             &arm_connection_state_change,
                             &main_context);
-  armon = GNUNET_ARM_monitor (main_context.cfg,
-                              &service_status_change,
-                              &main_context);
+  armon = GNUNET_ARM_monitor_start (main_context.cfg,
+                                    &service_status_change,
+                                    &main_context);
   main_context.gns = GNUNET_GNS_connect (main_context.cfg);
   main_context.identity = GNUNET_IDENTITY_connect (main_context.cfg, NULL, 
NULL);
   main_context.id_op = GNUNET_IDENTITY_get (main_context.identity,