[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-954-gb079ed3f2

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  b079ed3f2c025375a9bffb949fb1abad3b86bd1e (commit)
      from  bccb77e8ec81e64bb3701ad8ef9aa0ea31241d5f (commit)

Summary of changes:
 src/gtk/gtkutils.c | 4 ++--
 src/mbox.c         | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit b079ed3f2c025375a9bffb949fb1abad3b86bd1e
Author: Paul <paul at claws-mail.org>
Date:   Tue May 12 18:17:08 2020 +0100

    make the progress window more responsive when importing mbox file

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 84661ab39..b6109be01 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -757,7 +757,7 @@ static gboolean move_bar_cb(gpointer data)
 	if (!GTK_IS_PROGRESS_BAR(w)) {
 		return FALSE;
 	}
-
+	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(w), 0.1);
 	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(w));
 	GTK_EVENTS_FLUSH();
 	return TRUE;
diff --git a/src/mbox.c b/src/mbox.c
index d20a51b35..f857b78f5 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -1,6 +1,10 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+<<<<<<< HEAD
  * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
+=======
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
+>>>>>>> d4db7d121... make the progress window more responsive when importing mbox file
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,7 +138,7 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter,
 		gint empty_lines;
 		gint msgnum;
 		
-		if (msgs%500 == 0) {
+		if (msgs%10 == 0) {
 			long cur_offset_mb = ftell(mbox_fp) / (1024 * 1024);
 			if (printed)
 				statusbar_pop_all();

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail