[Winpt-commits] r345 - in trunk: . Doc/website Src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Sun Nov 27 16:14:27 CET 2011
Author: twoaday
Date: 2011-11-27 16:14:26 +0100 (Sun, 27 Nov 2011)
New Revision: 345
Modified:
trunk/AUTHORS
trunk/Doc/website/development.html
trunk/NEWS
trunk/README
trunk/Src/ChangeLog
trunk/Src/wptKeygenDlg.cpp
trunk/Src/wptProxySettingsDlg.cpp
trunk/configure.ac
Log:
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/AUTHORS 2011-11-27 15:14:26 UTC (rev 345)
@@ -26,9 +26,7 @@
Free Software Foundation <fsf at gnu.org>
(rmd160.c, sha1.c, sha512.c, md5.c)
-sunlink.c - Matt Gauthier <elleron at yahoo.com>
-
Translators:
Names marked with (*) are retired
Modified: trunk/Doc/website/development.html
===================================================================
--- trunk/Doc/website/development.html 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/Doc/website/development.html 2011-11-27 15:14:26 UTC (rev 345)
@@ -42,14 +42,16 @@
<tr>
<td><table border="0" cellspacing="0" cellpadding="3">
<tr>
- <td width="150" align="left" valign="top" bgcolor="#FFFFCC"><p><span class="style2"><a href="index.html">Home and News</a><br />
+ <td width="150" align="left" valign="top" bgcolor="#FFFFCC">
+ <p><span class="style2"><a href="index.html">Home and News</a><br />
<a href="screenshots.html">Screenshots</a><br />
<a href="download.html">Download</a><br />
<a href="mailinglist.html">Mailing Lists</a><br />
<a href="development.html">Development Site</a> <br />
<a href="bugs.html"">Bug Reports</a><br />
<a href="contact.html">Contact</a></span><br />
- </p> </td>
+ </p>
+ </td>
<td align="left" valign="top"> <p class="style2">
WinPT has a seperate development website which is designed to help people to create and improve the WinPT program.
Even so it contains forums and access to a lot of useful information it is not for novice users.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/NEWS 2011-11-27 15:14:26 UTC (rev 345)
@@ -1,2 +1,9 @@
Noteworthy changes in version 1.5.x
-----------------------------------
+
+- WinPT now requires Windows XP or higher.
+ Support for all older versions, especially Win9x, has
+ been entirely dropped.
+
+- The minimal GnuPG version is now 1.4.11.
+
Modified: trunk/README
===================================================================
--- trunk/README 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/README 2011-11-27 15:14:26 UTC (rev 345)
@@ -5,28 +5,23 @@
Bugs and Improvements
---------------------
-I have tried to thoroughly test this program, but if you've found a bug,
-please send me a message with a full error description or go directly
-to http://wald.intevation.org and use the WinPT bug tracking system.
+Because of the long phase of inactivity, it is very likely that the
+current code has problems with a recent GnuPG and Windows version. You
+can find an (outdated) tracker at <http://wald.intevation.org>.
Please include as much detail as possible including OS version, WinPT
-version, and GPG version in use. Please summarize your gpg configuration
+version, and GPG version in use. Please also summarize your gpg configuration
and describe any special programs or configurations on your machine.
-I try to fix bugs as quickly as possible and will upload all updates to
-http://wald.intevation.org/projects/winpt
+Update and new releases will be available at:
+<http://wald.intevation.org/projects/winpt>
Legacy Windows versions
-----------------------
-I know a lot of people still user old versions of WinPT but it is very
-hard to test the code on all these platforms and thus I decided to
-obsolete the support for these OS versions: Win95, WinME/98. The code
-works on 98/ME without known limitations but if you will encounter
-a serious problem, I doubt I can fix it without having this OS and
-this is the major problem! It is likewise with older NT based systems
-like NT4 and, with each new year, Win2K.
+WinPT requires at least Windows XP or higher. Currently, the support
+for Windows 7 is limited and we do not give any support for Vista.
What is WinPT?
@@ -53,7 +48,7 @@
Install
-------
-First you should install the GPG binary, version 1.4.x or later.
+First you should install the GPG binary, version 1.4.11 or later.
(If you want to use a directory other than the default you must modify
the preferences in the WinPT program at Preferences->GPG Preferences).
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/Src/ChangeLog 2011-11-27 15:14:26 UTC (rev 345)
@@ -9,6 +9,8 @@
* wptKeyEditDlgs.cpp (is_jpg_file): Modernized.
(keyedit_addsubkey_dlg_proc): Removed 1024-bit DSA check
and rewrote index to gpg menu mapping. Fixed wrong text label.
+ * wptProxySettingsDlg.cpp (keyserver_proxy_dlg_proc): Use balloon
+ error boxes.
* Integrated patches from Remi FAVIER.
Modified: trunk/Src/wptKeygenDlg.cpp
===================================================================
--- trunk/Src/wptKeygenDlg.cpp 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/Src/wptKeygenDlg.cpp 2011-11-27 15:14:26 UTC (rev 345)
@@ -174,8 +174,9 @@
char *path = get_gnupg_path ();
const char *name = get_filesave_dlg (dlg, _("Destination for Public Keyring"),
NULL, "pubring_bak.gpg");
+ char *keyring;
if (name != NULL) {
- char *keyring = make_filename (path, "pubring", "gpg");
+ keyring = make_filename (path, "pubring", "gpg");
if (!CopyFile (keyring, name, FALSE)) {
log_box (_("Key Generation"), MB_ERR,
_("Could not copy %s -> %s"), keyring, name);
Modified: trunk/Src/wptProxySettingsDlg.cpp
===================================================================
--- trunk/Src/wptProxySettingsDlg.cpp 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/Src/wptProxySettingsDlg.cpp 2011-11-27 15:14:26 UTC (rev 345)
@@ -100,7 +100,7 @@
int pos = 0;
if (check_inet_address (t)) {
- msg_box (dlg, _("Invalid host or IP address."), _("Proxy Settings"), MB_ERR);
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_HOST), _("Invalid host or IP address."), IDI_ERROR);
return -1;
}
/* TODO: check prefix */
@@ -109,20 +109,18 @@
ctx->host = m_strdup (t + pos);
}
else {
- msg_box (dlg, _("Please enter the proxy hostname."),
- _("Proxy Settings"), MB_ERR);
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_HOST), _("Please enter the proxy hostname."), IDI_ERROR);
return -1;
}
if (check_number (dlg, IDC_PROXY_PORT)) {
- msg_box (dlg, _("Invalid port number."), _("Proxy Settings"), MB_ERR);
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_PORT), _("Invalid port number."), IDI_ERROR);
return -1;
}
ctx->port = GetDlgItemInt (dlg, IDC_PROXY_PORT, NULL, FALSE);
if (ctx->port < 0 || ctx->port > 65535) {
- msg_box (dlg, _("Please select a value from 0-65535 for the port"),
- _("Proxy Settings"), MB_INFO);
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_PORT), _("Please select a value from 0-65535 for the port"), IDI_ERROR);
return -1;
}
if ((ctx->user && !ctx->pass) || (!ctx->user && ctx->pass)) {
@@ -130,7 +128,7 @@
"please fill out both fields."), _("Proxy Settings"), MB_ERR);
return -1;
}
- if ((ctx->host && ctx->port==0) || (!ctx->host && ctx->port != 0)) {
+ if ((ctx->host && ctx->port == 0) || (!ctx->host && ctx->port != 0)) {
msg_box (dlg, _("Please enter a host name and a port."),
_("Proxy Settings"), MB_INFO);
return -1;
@@ -160,7 +158,6 @@
combox_add_string (cb, (char *)"NONE");
combox_add_string (cb, (char *)"HTTP");
- // TODO: combox_add_string (cb, (char *)"SOCKS5");
SendMessage (cb, CB_SETCURSEL, (WPARAM)0, 0);
}
@@ -195,21 +192,17 @@
SetDlgItemText (dlg, IDC_PROXY_AUTHINF, _("Authentication"));
SetWindowText (dlg, _("Proxy Settings"));
init_proxy_protocols (dlg);
- SendDlgItemMessage (dlg, IDC_PROXY_PROTO, CB_SETCURSEL,
- (WPARAM)proxy.proto, 0);
+ SendDlgItemMessage (dlg, IDC_PROXY_PROTO, CB_SETCURSEL, (WPARAM)proxy.proto, 0);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
break;
+ case WM_DESTROY:
+ balloon_msg_disable ();
+ break;
+
case WM_COMMAND:
switch (HIWORD (wparam)) {
- case CBN_SELCHANGE:
- if (combo_get_sel (dlg, (int)LOWORD (wparam))) {
- }
- else {
- }
- break;
-
case BN_CLICKED:
switch ((int)LOWORD (wparam)) {
case IDC_PROXY_AUTH:
@@ -224,11 +217,11 @@
switch (LOWORD (wparam)) {
case IDOK:
- if (IsDlgButtonChecked (dlg, IDC_PROXY_AUTH) &&
- item_get_text_length (dlg, IDC_PROXY_USER) == 0 &&
- item_get_text_length (dlg, IDC_PROXY_PWD) == 0) {
- msg_box (dlg, _("Please fill out all required fields to enable proxy authentication."),
- _("Proxy Settings"), MB_WARN);
+ if (IsDlgButtonChecked (dlg, IDC_PROXY_AUTH)) {
+ if (item_get_text_length (dlg, IDC_PROXY_USER) == 0)
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_USER), _("Please enter a user name"), IDI_ERROR);
+ if (item_get_text_length (dlg, IDC_PROXY_PWD) == 0)
+ show_balloon_msg (GetDlgItem (dlg, IDC_PROXY_PWD), _("Please enter a password"), IDI_ERROR);
return TRUE;
}
kserver_proxy_release (&proxy);
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-11-27 14:56:52 UTC (rev 344)
+++ trunk/configure.ac 2011-11-27 15:14:26 UTC (rev 345)
@@ -20,11 +20,11 @@
# We always force to use the minimal GPG version which is
# known to be free of reported security issues
-NEED_GPG_VERSION=1.4.6
+NEED_GPG_VERSION=1.4.11
NEED_GPGME_API=1
-NEED_GPGME_VERSION=1.1.4
-NEED_GPG_ERROR_VERSION=1.2
+NEED_GPGME_VERSION=1.3.1
+NEED_GPG_ERROR_VERSION=1.10
PACKAGE=$PACKAGE_NAME
PACKAGE_GT=${PACKAGE_NAME}
More information about the Winpt-commits
mailing list