talons

commit 2d642855c383826fbcfee8bf14ce1529dde1c97b
parent fea23170343caded642ecd96c4edc19e49a193d7
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Fri, 22 Jan 2010 20:50:03 +0000

2010-01-22 [pawel]	3.7.4cvs7

	* autogen.sh
		--disable-aspell -> --disable-enchant
	* configure.ac
		Fix options spacing in configure --help
	* src/wizard.c
		Make wizard's window centered on the screen

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
autogen.sh
 | 
2
+-
M
configure.ac
 | 
6
+++---
M
src/wizard.c
 | 
1
+

5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-22 [pawel]	3.7.4cvs7
+
+	* autogen.sh
+		--disable-aspell -> --disable-enchant
+	* configure.ac
+		Fix options spacing in configure --help
+	* src/wizard.c
+		Make wizard's window centered on the screen
+
 2010-01-19 [holger]	3.7.4cvs6
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3937,3 +3937,4 @@
 ( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.4cvs4.patchset
 ( cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/gtk/authors.h;  ) > 3.7.4cvs5.patchset
 ( cvs diff -u -r 1.213.2.195 -r 1.213.2.196 src/folder.c;  cvs diff -u -r 1.87.2.60 -r 1.87.2.61 src/folder.h;  ) > 3.7.4cvs6.patchset
+( cvs diff -u -r 1.4.2.9 -r 1.4.2.10 autogen.sh;  cvs diff -u -r 1.654.2.4008 -r 1.654.2.4009 configure.ac;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/wizard.c;  ) > 3.7.4cvs7.patchset
diff --git a/autogen.sh b/autogen.sh
@@ -38,7 +38,7 @@ if test "$1" = "--build-w32"; then
 	     --with-gpgme-prefix=${w32root} \
              --with-config-dir="Claws-mail" \
              --disable-openssl --disable-dillo-viewer-plugin \
-             --disable-nls --disable-libetpan --disable-aspell \
+             --disable-nls --disable-libetpan --disable-enchant \
              --disable-trayicon-plugin --disable-spamassassin-plugin \
              --disable-bogofilter-plugin --disable-valgrind \
              PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig"
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -382,9 +382,9 @@ fi
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use GnuTLS])
-AC_ARG_ENABLE(openssl,    [ --enable-openssl      enable GnuTLS support],
+AC_ARG_ENABLE(openssl,    [  --enable-openssl      enable GnuTLS support],
             [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
-AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
+AC_ARG_ENABLE(gnutls,    [  --enable-gnutls      enable GnuTLS support],
             [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
 
 if test "x$ac_cv_enable_gnutls" != "xyes"; then
diff --git a/src/wizard.c b/src/wizard.c
@@ -1775,6 +1775,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
 			GTK_STOCK_CANCEL, CANCEL,
 			NULL);
 	gtk_widget_set_size_request(wizard->window, -1, 480);
+	gtk_window_set_position(GTK_WINDOW(wizard->window), GTK_WIN_POS_CENTER);
 
 	g_signal_connect(wizard->window, "response", 
 			  G_CALLBACK(wizard_response_cb), wizard);