diff options
Diffstat (limited to 'src/fs/gnunet-fs-gtk.c')
-rw-r--r-- | src/fs/gnunet-fs-gtk.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c index c4cf18af..bedefb1e 100644 --- a/src/fs/gnunet-fs-gtk.c +++ b/src/fs/gnunet-fs-gtk.c | |||
@@ -35,7 +35,8 @@ | |||
35 | #include <gnunet/gnunet_arm_service.h> | 35 | #include <gnunet/gnunet_arm_service.h> |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * How many block requests can we have outstanding in parallel at a time by default? | 38 | * How many block requests can we have outstanding in parallel at a time by |
39 | * default? | ||
39 | */ | 40 | */ |
40 | #define DEFAULT_MAX_PARALLEL_REQUESTS 100000 | 41 | #define DEFAULT_MAX_PARALLEL_REQUESTS 100000 |
41 | 42 | ||
@@ -205,7 +206,7 @@ main_window_save_position (GtkWidget *main_window) | |||
205 | "gnunet-fs-gtk", | 206 | "gnunet-fs-gtk", |
206 | "MAIN_WINDOW_MAXIMIZED", | 207 | "MAIN_WINDOW_MAXIMIZED", |
207 | (maximized == GNUNET_YES) ? "YES" | 208 | (maximized == GNUNET_YES) ? "YES" |
208 | : "NO"); | 209 | : "NO"); |
209 | 210 | ||
210 | cfgDefault = GNUNET_CONFIGURATION_create (); | 211 | cfgDefault = GNUNET_CONFIGURATION_create (); |
211 | (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */ | 212 | (void) GNUNET_CONFIGURATION_load (cfgDefault, NULL); /* load defaults only */ |
@@ -300,11 +301,6 @@ shutdown_task (void *cls) | |||
300 | GNUNET_GNS_disconnect (main_context.gns); | 301 | GNUNET_GNS_disconnect (main_context.gns); |
301 | main_context.gns = NULL; | 302 | main_context.gns = NULL; |
302 | } | 303 | } |
303 | if (NULL != main_context.sks_zone) | ||
304 | { | ||
305 | GNUNET_free (main_context.sks_zone); | ||
306 | main_context.sks_zone = NULL; | ||
307 | } | ||
308 | } | 304 | } |
309 | 305 | ||
310 | 306 | ||
@@ -454,6 +450,8 @@ unique_app_message_cb (UniqueApp *app, | |||
454 | } | 450 | } |
455 | return UNIQUE_RESPONSE_OK; | 451 | return UNIQUE_RESPONSE_OK; |
456 | } | 452 | } |
453 | |||
454 | |||
457 | #endif | 455 | #endif |
458 | 456 | ||
459 | 457 | ||
@@ -663,21 +661,22 @@ handle_sks_zone_identity (void *cls, | |||
663 | "No default ego specified for `fs-sks` service, will not enable namespace search.\n")); | 661 | "No default ego specified for `fs-sks` service, will not enable namespace search.\n")); |
664 | return; | 662 | return; |
665 | } | 663 | } |
666 | main_context.sks_zone = GNUNET_new (struct GNUNET_IDENTITY_PrivateKey); | 664 | main_context.sks_zone = ego; |
667 | *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego); | ||
668 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( | 665 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( |
669 | "main_window_search_namespace_label"))); | 666 | "main_window_search_namespace_label"))); |
670 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( | 667 | gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ( |
671 | "main_window_search_namespace_combobox"))); | 668 | "main_window_search_namespace_combobox"))); |
672 | main_context.zm = GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg, | 669 | main_context.zm = |
673 | main_context.sks_zone, | 670 | GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg, |
674 | GNUNET_YES, | 671 | GNUNET_IDENTITY_ego_get_private_key ( |
675 | &monitor_zone_error, | 672 | main_context.sks_zone), |
676 | NULL, | 673 | GNUNET_YES, |
677 | &monitor_zone_records, | 674 | &monitor_zone_error, |
678 | NULL, | 675 | NULL, |
679 | &monitor_zone_sync, | 676 | &monitor_zone_records, |
680 | NULL); | 677 | NULL, |
678 | &monitor_zone_sync, | ||
679 | NULL); | ||
681 | } | 680 | } |
682 | 681 | ||
683 | 682 | ||