From edd6040f34e361b5b8e1c489ec61d84af3653060 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 30 Jan 2007 18:19:25 +0000 Subject: [PATCH 1/1] 2007-01-30 [colin] 2.7.2cvs8 * src/main.c Fix hidden mainwindow after clicking on the X close button, if compose windows exist and the user chooses not to quit --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8e0801a97..5ee9b2a45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-30 [colin] 2.7.2cvs8 + + * src/main.c + Fix hidden mainwindow after clicking on + the X close button, if compose windows + exist and the user chooses not to quit + 2007-01-30 [colin] 2.7.2cvs7 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 452321c12..49e8c787d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2325,3 +2325,4 @@ ( cvs diff -u -r 1.53.2.22 -r 1.53.2.23 po/POTFILES.in; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/trayicon/trayicon_prefs.c; ) > 2.7.2cvs5.patchset ( cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/prefs_ext_prog.c; ) > 2.7.2cvs6.patchset ( cvs diff -u -r 1.115.2.130 -r 1.115.2.131 src/main.c; cvs diff -u -r 1.382.2.355 -r 1.382.2.356 src/compose.c; ) > 2.7.2cvs7.patchset +( cvs diff -u -r 1.115.2.131 -r 1.115.2.132 src/main.c; ) > 2.7.2cvs8.patchset diff --git a/configure.ac b/configure.ac index 762435406..17dd44837 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=7 +EXTRA_VERSION=8 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/main.c b/src/main.c index dfd4036b1..b68eaff4e 100644 --- a/src/main.c +++ b/src/main.c @@ -1320,6 +1320,7 @@ void app_will_exit(GtkWidget *widget, gpointer data) _("_Save to Draft"), _("_Discard them"), _("Do_n't quit")); switch (val) { case G_ALERTOTHER: + main_window_popup(mainwin); sc_exiting = FALSE; return; case G_ALERTALTERNATE: @@ -1336,6 +1337,7 @@ void app_will_exit(GtkWidget *widget, gpointer data) _("Some unsent messages are queued. Exit now?"), GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL) != G_ALERTALTERNATE) { + main_window_popup(mainwin); sc_exiting = FALSE; return; } -- 2.25.1