From: Colin Leroy <colin@colino.net>
Date: Fri, 24 Aug 2007 13:37:39 +0000 (+0000)
Subject: 2007-08-24 [colin]	2.10.0cvs166
X-Git-Tag: rel_3_0_0~27
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d10b4bf5312b255a5fe2b974423d8b21d2d42f62;hp=e6dc3b7ea5d4eff44fb85a01caa416fe20f3889d

2007-08-24 [colin]	2.10.0cvs166

	* src/send_message.c
		Use progress bar when sending messages
---

diff --git a/ChangeLog b/ChangeLog
index 902c38ed2..96db2ff35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-24 [colin]	2.10.0cvs166
+
+	* src/send_message.c
+		Use progress bar when sending messages
+
 2007-08-24 [paul]	2.10.0cvs165
 
 	* Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
index c436e2337..f0674ba65 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2820,3 +2820,4 @@
 ( cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/plugins.xml;  ) > 2.10.0cvs163.patchset
 ( cvs diff -u -r 1.100.2.51 -r 1.100.2.52 AUTHORS;  cvs diff -u -r 1.24.2.21 -r 1.24.2.22 Makefile.am;  cvs diff -u -r 1.8.2.38 -r 1.8.2.39 README;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/gtk/authors.h;  cvs diff -u -r 1.25.2.21 -r 1.25.2.22 tools/Makefile.am;  cvs diff -u -r 1.30.2.23 -r 1.30.2.24 tools/README;  diff -u /dev/null tools/mew2claws-mail.pl;  ) > 2.10.0cvs164.patchset
 ( cvs diff -u -r 1.24.2.22 -r 1.24.2.23 Makefile.am;  ) > 2.10.0cvs165.patchset
+( cvs diff -u -r 1.17.2.41 -r 1.17.2.42 src/send_message.c;  ) > 2.10.0cvs166.patchset
diff --git a/configure.ac b/configure.ac
index 7584f0440..b1e68bfb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=165
+EXTRA_VERSION=166
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/send_message.c b/src/send_message.c
index e32f0f866..683fc6a7b 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -507,7 +507,8 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
 {
 	gchar buf[BUFFSIZE];
 	SendProgressDialog *dialog = (SendProgressDialog *)data;
-
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+	
 	g_return_val_if_fail(dialog != NULL, -1);
 
 	if (SMTP_SESSION(session)->state != SMTP_SEND_DATA &&
@@ -520,16 +521,26 @@ static gint send_send_data_progressive(Session *session, guint cur_len,
 	progress_dialog_set_fraction
 		(dialog->dialog, (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
 
+	if (mainwin)
+		gtk_progress_bar_set_fraction
+			(GTK_PROGRESS_BAR(mainwin->progressbar),
+			 (total_len == 0) ? 0 : (gfloat)cur_len / (gfloat)total_len);
+
 	return 0;
 }
 
 static gint send_send_data_finished(Session *session, guint len, gpointer data)
 {
 	SendProgressDialog *dialog = (SendProgressDialog *)data;
+	MainWindow *mainwin = mainwindow_get_mainwindow();
 
 	g_return_val_if_fail(dialog != NULL, -1);
 
 	send_send_data_progressive(session, len, len, dialog);
+	if (mainwin)
+		gtk_progress_bar_set_fraction
+			(GTK_PROGRESS_BAR(mainwin->progressbar),(gfloat)0);
+
 	return 0;
 }