2009-01-21 [colin] 3.7.0cvs40

	* src/account.c
	* src/addressbook.c
		Win32: Fix window placement

diff --git a/ChangeLog b/ChangeLog
index aa548df40fd7d2c7c45d7a8eb8faa2156e9b7b99..6be1fd073b3ecb0690f2280b087aae131aa17dbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-21 [colin]     3.7.0cvs40
+
+       * src/account.c
+       * src/addressbook.c
+               Win32: Fix window placement
+
 2009-01-21 [paul]      3.7.0cvs39
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index 29fc606e8ea60bb783992f438fc3d07ee568d4b2..68c510ef432835c5e076073c6ccd3c9947c3874f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3701,3 +3701,4 @@
 ( cvs diff -u -r 1.60.2.128 -r 1.60.2.129 src/addressbook.c;  cvs diff -u -r 1.382.2.494 -r 1.382.2.495 src/compose.c;  cvs diff -u -r 1.26.2.41 -r 1.26.2.42 src/foldersel.c;  cvs diff -u -r 1.115.2.218 -r 1.115.2.219 src/main.c;  cvs diff -u -r 1.274.2.295 -r 1.274.2.296 src/mainwindow.c;  cvs diff -u -r 1.28.2.44 -r 1.28.2.45 src/mbox.c;  cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/md5.c;  cvs diff -u -r 1.4.2.35 -r 1.4.2.36 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/common/tags.c;  cvs diff -u -r 1.36.2.163 -r 1.36.2.164 src/common/utils.c;  cvs diff -u -r 1.1.4.107 -r 1.1.4.108 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/smime/smime.c;  ) > 3.7.0cvs37.patchset
 ( cvs diff -u -r 1.115.2.219 -r 1.115.2.220 src/main.c;  cvs diff -u -r 1.28.2.45 -r 1.28.2.46 src/mbox.c;  cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/common/md5.c;  cvs diff -u -r 1.36.2.164 -r 1.36.2.165 src/common/utils.c;  cvs diff -u -r 1.1.4.108 -r 1.1.4.109 src/etpan/imap-thread.c;  ) > 3.7.0cvs38.patchset
 ( cvs diff -u -r 1.149.2.98 -r 1.149.2.99 src/inc.c;  ) > 3.7.0cvs39.patchset
+( cvs diff -u -r 1.61.2.92 -r 1.61.2.93 src/account.c;  cvs diff -u -r 1.60.2.129 -r 1.60.2.130 src/addressbook.c;  ) > 3.7.0cvs40.patchset

diff --git a/configure.ac b/configure.ac
index 41e0bc539a0385e8151fe9739ba060fbf5215bc9..a2344992d75c825afc5e7c1e0e5f54241d65ab8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 539bbbdeade784ecc77d792a627849c13ff366d4..3706c03eb3f17e63d71d153aefb2fdfbd28af859 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -824,6 +824,9 @@ static void account_edit_create(void)
                                      GDK_HINT_MIN_SIZE);
        gtk_widget_set_size_request(window, prefs_common.accountswin_width,
                                    prefs_common.accountswin_height);
+#ifdef G_OS_WIN32
+       gtk_window_move(GTK_WINDOW(window), 48, 48);
+#endif
 
        edit_account.window    = window;
        edit_account.list_view = list_view;

diff --git a/src/addressbook.c b/src/addressbook.c
index 4e9fe38bb792d23de646d90299d1e7cb86b80b19..a54968114c9b9dda968615a3322d5e6dbd7402ed 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1339,6 +1339,9 @@ static void addressbook_create(void)
                                      GDK_HINT_MIN_SIZE);
        gtk_widget_set_size_request(window, prefs_common.addressbookwin_width,
                                    prefs_common.addressbookwin_height);
+#ifdef G_OS_WIN32
+       gtk_window_move(GTK_WINDOW(window), 48, 48);
+#endif
 
        if (!prefs_common.addressbook_use_editaddress_dialog) {
                if (prefs_common.addressbook_vpaned_pos > 0)