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.

diff --git a/ChangeLog b/ChangeLog
index 6a245d8c4cab0acb4d2de5d49bde3b881d11f839..4441cd8b44201f677d71d081c8c7af0841a32b0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2012-01-25 [wwp]       3.8.0cvs17
 
        * src/addr_compl.c

diff --git a/PATCHSETS b/PATCHSETS
index 63431b32a463bbf0c7cd8d30fee302abc9707abd..503bbfcdde796cf18e5beaca6588f46bdd406bb7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4334,3 +4334,4 @@
 ( cvs diff -u -r 1.83.2.187 -r 1.83.2.188 src/mimeview.c;  ) > 3.8.0cvs15.patchset
 ( cvs diff -u -r 1.22.2.26 -r 1.22.2.27 src/addrbook.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/exportldif.c;  ) > 3.8.0cvs16.patchset
 ( cvs diff -u -r 1.27.2.59 -r 1.27.2.60 src/addr_compl.c;  ) > 3.8.0cvs17.patchset
+( cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/gtk/progressdialog.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/progressdialog.h;  cvs diff -u -r 1.149.2.104 -r 1.149.2.105 src/inc.c;  cvs diff -u -r 1.17.2.61 -r 1.17.2.62 src/send_message.c;  ) > 3.8.0cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 9237b06e48dcc6f9b3e90d740e46b5ddb2d8af09..f038ab25a7432143dbe9cbdddaf1df179bf6e609 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/progressdialog.c b/src/gtk/progressdialog.c
index 2d97dce91811375ce4f507ab0150e569ac379b16..92c40fde22c7ceb62a312bd53047b50ef1b00b93 100644 (file)
--- a/src/gtk/progressdialog.c
+++ b/src/gtk/progressdialog.c
@@ -50,6 +50,7 @@ ProgressDialog *progress_dialog_create(void)
        GtkWidget *hbox;
        GtkWidget *vbox;
        GtkWidget *label;
+       GtkWidget *showlog_btn;
        GtkWidget *cancel_btn;
        GtkWidget *progressbar;
        GtkWidget *scrolledwin;
@@ -81,6 +82,9 @@ ProgressDialog *progress_dialog_create(void)
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
        gtk_widget_show(label);
 
+       showlog_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+                                          _("_Show log"),
+                                          GTK_RESPONSE_NONE);
        cancel_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
                                           GTK_STOCK_CANCEL,
                                           GTK_RESPONSE_NONE);
@@ -100,7 +104,6 @@ ProgressDialog *progress_dialog_create(void)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-
        store = gtk_list_store_new(N_PROGRESS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
                                   G_TYPE_STRING, G_TYPE_POINTER);
 
@@ -142,6 +145,7 @@ ProgressDialog *progress_dialog_create(void)
        
        progress->window      = dialog;
        progress->label       = label;
+       progress->showlog_btn  = showlog_btn;
        progress->cancel_btn  = cancel_btn;
        progress->progressbar = progressbar;
        progress->treeview    = treeview;

diff --git a/src/gtk/progressdialog.h b/src/gtk/progressdialog.h
index f7374f0db1271b015df3f73d7363b32bf7edd276..a9dac94c52d6ace90ed1f6a35a710ef93b1e1c50 100644 (file)
--- a/src/gtk/progressdialog.h
+++ b/src/gtk/progressdialog.h
@@ -29,6 +29,7 @@ struct _ProgressDialog
 {
        GtkWidget *window;
        GtkWidget *label;
+       GtkWidget *showlog_btn;
        GtkWidget *cancel_btn;
        GtkWidget *progressbar;
        GtkWidget *treeview;

diff --git a/src/inc.c b/src/inc.c
index 8d200b2b61d2b11dcdab719e6d4bf21b1b6703e6..9f14c9b074933768783a04fc3bae9fe59137979f 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -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 gint inc_drop_message                (Pop3Session    *session,
 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 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
        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 @@ void inc_cancel_all(void)
                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);

diff --git a/src/send_message.c b/src/send_message.c
index 4b841aae8efe71ef83c33f0756b482a471b5234c..4b309df0591623c2c689fb7f3996ebfa48f5c993 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -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 gint send_send_data_finished   (Session                *session,
 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 @@ static SendProgressDialog *send_progress_dialog_create(void)
        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 @@ static void send_progress_dialog_destroy(SendProgressDialog *dialog)
        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;