[Commits] inc.c 1.149.2.104 1.149.2.105 send_message.c 1.17.2.61 1.17.2.62

[wwp at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv29304/src

Modified Files:
      Tag: gtk2
	inc.c send_message.c 
Log Message:
2012-01-31 [wwp]	3.8.0cvs18

	* src/gtk/progressdialog.c
	* src/gtk/progressdialog.h
	* src/inc.c
	* src/send_message.c
	Add a button to the retrieve/send dialogs to
	open the network log.

Index: inc.c
===================================================================
RCS file: /home/claws-mail/claws/src/inc.c,v
retrieving revision 1.149.2.104
retrieving revision 1.149.2.105
diff -u -d -r1.149.2.104 -r1.149.2.105
--- inc.c	5 May 2011 07:26:37 -0000	1.149.2.104
+++ inc.c	31 Jan 2012 08:43:21 -0000	1.149.2.105
@@ -57,6 +57,7 @@
 #include "filtering.h"
 #include "log.h"
 #include "hooks.h"
+#include "logwindow.h"
 
 #ifdef MAEMO
 #ifdef CHINOOK
@@ -133,6 +134,8 @@
 static void inc_put_error		(IncState	 istate,
 					 Pop3Session 	*session);
 
+static void inc_showlog_cb		(GtkWidget	*widget,
+					 gpointer	 data);
 static void inc_cancel_cb		(GtkWidget	*widget,
 					 gpointer	 data);
 static gint inc_dialog_delete_cb	(GtkWidget	*widget,
@@ -413,6 +416,8 @@
 	progress = progress_dialog_create();
 	gtk_window_set_title(GTK_WINDOW(progress->window),
 			     _("Retrieving new messages"));
+	g_signal_connect(G_OBJECT(progress->showlog_btn), "clicked",
+			 G_CALLBACK(inc_showlog_cb), dialog);
 	g_signal_connect(G_OBJECT(progress->cancel_btn), "clicked",
 			 G_CALLBACK(inc_cancel_cb), dialog);
 	g_signal_connect(G_OBJECT(progress->window), "delete_event",
@@ -1260,6 +1265,13 @@
 		inc_cancel((IncProgressDialog *)cur->data);
 }
 
+static void inc_showlog_cb(GtkWidget *widget, gpointer data)
+{
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+
+	log_window_show(mainwin->logwin);
+}
+
 static void inc_cancel_cb(GtkWidget *widget, gpointer data)
 {
 	inc_cancel((IncProgressDialog *)data);

Index: send_message.c
===================================================================
RCS file: /home/claws-mail/claws/src/send_message.c,v
retrieving revision 1.17.2.61
retrieving revision 1.17.2.62
diff -u -d -r1.17.2.61 -r1.17.2.62
--- send_message.c	22 Oct 2011 17:09:03 -0000	1.17.2.61
+++ send_message.c	31 Jan 2012 08:43:21 -0000	1.17.2.62
@@ -47,6 +47,7 @@
 #include "inputdialog.h"
 #include "alertpanel.h"
 #include "manage_window.h"
+#include "logwindow.h"
 #include "socket.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -76,6 +77,8 @@
 static SendProgressDialog *send_progress_dialog_create(void);
 static void send_progress_dialog_destroy(SendProgressDialog *dialog);
 
+static void send_showlog_button_cb	(GtkWidget	*widget,
+					 gpointer	 data);
 static void send_cancel_button_cb	(GtkWidget	*widget,
 					 gpointer	 data);
 
@@ -556,6 +559,8 @@
 	progress = progress_dialog_create();
 	gtk_window_set_title(GTK_WINDOW(progress->window),
 			     _("Sending message"));
+	g_signal_connect(G_OBJECT(progress->showlog_btn), "clicked",
+			 G_CALLBACK(send_showlog_button_cb), dialog);
 	g_signal_connect(G_OBJECT(progress->cancel_btn), "clicked",
 			 G_CALLBACK(send_cancel_button_cb), dialog);
 	g_signal_connect(G_OBJECT(progress->window), "delete_event",
@@ -595,6 +600,13 @@
 	g_free(dialog);
 }
 
+static void send_showlog_button_cb(GtkWidget *widget, gpointer data)
+{
+	MainWindow *mainwin = mainwindow_get_mainwindow();
+
+	log_window_show(mainwin->logwin);
+}
+
 static void send_cancel_button_cb(GtkWidget *widget, gpointer data)
 {
 	SendProgressDialog *dialog = (SendProgressDialog *)data;