diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-06-24 11:37:21 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-06-24 11:37:21 +0000 |
commit | ff63934d2a8bc97df0916a8db490f8eaceec71b6 (patch) | |
tree | 8e43d6e13808dce8a44720846a5a97d4976f4d85 | |
parent | 3f35a3dfc764d4667cb72c5f64172211c843a9c2 (diff) | |
download | gnunet-gtk-ff63934d2a8bc97df0916a8db490f8eaceec71b6.tar.gz gnunet-gtk-ff63934d2a8bc97df0916a8db490f8eaceec71b6.zip |
update code to reflect recent API changes
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c index d7266eac..c00a764f 100644 --- a/src/fs/gnunet-fs-gtk.c +++ b/src/fs/gnunet-fs-gtk.c | |||
@@ -44,7 +44,6 @@ | |||
44 | */ | 44 | */ |
45 | #define DEFAULT_MAX_PARALLEL_DOWNLOADS 128 | 45 | #define DEFAULT_MAX_PARALLEL_DOWNLOADS 128 |
46 | 46 | ||
47 | #define SERVICE_LIST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) | ||
48 | 47 | ||
49 | /** | 48 | /** |
50 | * The GNUNET_GTK_file_sharing_downloads_tree_store with the | 49 | * The GNUNET_GTK_file_sharing_downloads_tree_store with the |
@@ -257,12 +256,12 @@ shutdown_task (void *cls) | |||
257 | } | 256 | } |
258 | if (NULL != armon) | 257 | if (NULL != armon) |
259 | { | 258 | { |
260 | GNUNET_ARM_monitor_disconnect_and_free (armon); | 259 | GNUNET_ARM_monitor_stop (armon); |
261 | armon = NULL; | 260 | armon = NULL; |
262 | } | 261 | } |
263 | if (NULL != arm) | 262 | if (NULL != arm) |
264 | { | 263 | { |
265 | GNUNET_ARM_disconnect_and_free (arm); | 264 | GNUNET_ARM_disconnect (arm); |
266 | arm = NULL; | 265 | arm = NULL; |
267 | } | 266 | } |
268 | GNUNET_FS_GTK_close_uri_tab_ (); | 267 | GNUNET_FS_GTK_close_uri_tab_ (); |
@@ -539,7 +538,7 @@ arm_connection_state_change (void *cls, | |||
539 | service_list = format_service_list (0, NULL); | 538 | service_list = format_service_list (0, NULL); |
540 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); | 539 | GNUNET_FS_GTK_update_connection_indicator (cls, TRUE, service_list); |
541 | GNUNET_free_non_null (service_list); | 540 | GNUNET_free_non_null (service_list); |
542 | GNUNET_ARM_request_service_list (arm, SERVICE_LIST_TIMEOUT, | 541 | GNUNET_ARM_request_service_list (arm, |
543 | &service_list_callback, cls); | 542 | &service_list_callback, cls); |
544 | } | 543 | } |
545 | else | 544 | else |
@@ -559,7 +558,6 @@ service_status_change (void *cls, | |||
559 | * without requesting a list from ARM every goddamned time? | 558 | * without requesting a list from ARM every goddamned time? |
560 | */ | 559 | */ |
561 | GNUNET_ARM_request_service_list (arm, | 560 | GNUNET_ARM_request_service_list (arm, |
562 | SERVICE_LIST_TIMEOUT, | ||
563 | &service_list_callback, cls); | 561 | &service_list_callback, cls); |
564 | } | 562 | } |
565 | 563 | ||
@@ -801,9 +799,9 @@ run (void *cls) | |||
801 | arm = GNUNET_ARM_connect (main_context.cfg, | 799 | arm = GNUNET_ARM_connect (main_context.cfg, |
802 | &arm_connection_state_change, | 800 | &arm_connection_state_change, |
803 | &main_context); | 801 | &main_context); |
804 | armon = GNUNET_ARM_monitor (main_context.cfg, | 802 | armon = GNUNET_ARM_monitor_start (main_context.cfg, |
805 | &service_status_change, | 803 | &service_status_change, |
806 | &main_context); | 804 | &main_context); |
807 | main_context.gns = GNUNET_GNS_connect (main_context.cfg); | 805 | main_context.gns = GNUNET_GNS_connect (main_context.cfg); |
808 | main_context.identity = GNUNET_IDENTITY_connect (main_context.cfg, NULL, NULL); | 806 | main_context.identity = GNUNET_IDENTITY_connect (main_context.cfg, NULL, NULL); |
809 | main_context.id_op = GNUNET_IDENTITY_get (main_context.identity, | 807 | main_context.id_op = GNUNET_IDENTITY_get (main_context.identity, |