3 files changed, 14 insertions, 0 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 8c175389..e131847b 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -175,6 +175,8 @@ display_record (void *cls,
   gboolean is_public;
   char *value;
 
+  GNUNET_NAMESTORE_zone_monitor_next (zone_mon,
+                                      1);
   do_display = FALSE;
   value = NULL;
   for (unsigned int i = 0; i < rd_len; i++)
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index 7d39f1e3..24bfdbe5 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -598,6 +598,8 @@ monitor_zone_records (void *cls,
   gchar *id;
   gchar *label_gnu;
 
+  GNUNET_NAMESTORE_zone_monitor_next (main_context.zm,
+                                      1);
   ls = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("namespace_label_liststore"));
   label_gnu = g_strdup_printf ("%s.%s",
                                label,
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index ab30f597..e2150c1c 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -66,6 +66,12 @@
 #define QRCODE_IMAGE_SIZE 64
 
 /**
+ * How many notifications do we allow the namestore to send us
+ * before we need to start to catch up?
+ */
+#define NAMESTORE_MONITOR_WINDOW_SIZE 50
+
+/**
  * Columns in the gns model.
  */
 enum GNSTreestoreColumn
@@ -2402,6 +2408,8 @@ zone_iteration_proc (void *cls,
   GtkTreeIter sel_iter;
   GtkTreePath *sel_path;
 
+  GNUNET_NAMESTORE_zone_monitor_next (zmon,
+                                      1);
   if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
        (0 != strcmp (name, GNUNET_GNS_EMPTY_LABEL_AT)) )
   {
@@ -2641,6 +2649,8 @@ load_zone (const char *name,
                                               NULL,
                                               &zone_sync_proc,
                                               NULL);
+  GNUNET_NAMESTORE_zone_monitor_next (zmon,
+                                      NAMESTORE_MONITOR_WINDOW_SIZE - 1);
 }