From beeab4561a3a17c7536e312dd1ddadad8f31508e Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 3 Feb 2007 23:25:39 +0000 Subject: [PATCH] 2007-02-03 [colin] 2.7.2cvs18 * src/main.c Don't save the mainwindow size and position on emergency exit (libSM's "die" callback), Xfce seems to make the window smaller just before the size's saved. --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/main.c | 6 ++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37c0ed71e..04155b4e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-02-03 [colin] 2.7.2cvs18 + + * src/main.c + Don't save the mainwindow size and + position on emergency exit (libSM's + "die" callback), Xfce seems to make + the window smaller just before the + size's saved. + 2007-02-03 [colin] 2.7.2cvs17 * src/plugins/bogofilter/bogofilter.c diff --git a/PATCHSETS b/PATCHSETS index a5960b9a2..099fd93f5 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2335,3 +2335,4 @@ ( cvs diff -u -r 1.155.2.50 -r 1.155.2.51 src/Makefile.am; cvs diff -u -r 1.274.2.169 -r 1.274.2.170 src/mainwindow.c; cvs diff -u -r 1.94.2.121 -r 1.94.2.122 src/messageview.c; cvs diff -u -r 1.19.2.14 -r 1.19.2.15 src/messageview.h; cvs diff -u -r 1.96.2.167 -r 1.96.2.168 src/textview.c; cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/textview.h; diff -u /dev/null src/uri_opener.c; diff -u /dev/null src/uri_opener.h; ) > 2.7.2cvs15.patchset ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/partial_download.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/partial_download.h; cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/ssl_manager.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/ssl_manager.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/uri_opener.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/uri_opener.h; cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/wizard.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/wizard.h; cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/ssl_certificate.h; cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/quicksearch.h; cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.6 -r 1.6.2.7 src/gtk/sslcertwindow.h; ) > 2.7.2cvs16.patchset ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpinline/pgpinline.h; ) > 2.7.2cvs17.patchset +( cvs diff -u -r 1.115.2.132 -r 1.115.2.133 src/main.c; ) > 2.7.2cvs18.patchset diff --git a/configure.ac b/configure.ac index cbf34ff3c..525441caf 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=17 +EXTRA_VERSION=18 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/main.c b/src/main.c index b68eaff4e..edc77b077 100644 --- a/src/main.c +++ b/src/main.c @@ -1003,8 +1003,10 @@ static void exit_claws(MainWindow *mainwin) folder_func_to_all_folders(save_all_caches, NULL); folder_write_list(); - main_window_get_size(mainwin); - main_window_get_position(mainwin); + if (!emergency_exit) { + main_window_get_size(mainwin); + main_window_get_position(mainwin); + } prefs_common_write_config(); account_write_config_all(); addressbook_export_to_file(); -- 2.25.1