[svn] GpgOL - r228 - in trunk: . doc src
svn author wk
cvs at cvs.gnupg.org
Fri Mar 7 12:30:34 CET 2008
Author: wk
Date: 2008-03-07 12:30:33 +0100 (Fri, 07 Mar 2008)
New Revision: 228
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/doc/gpgol.texi
trunk/src/ChangeLog
trunk/src/common.h
trunk/src/main.c
trunk/src/olflange-dlgs.cpp
trunk/src/olflange.cpp
Log:
Print a note after a software upgrade.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/ChangeLog 2008-03-07 11:30:33 UTC (rev 228)
@@ -1,3 +1,7 @@
+2008-03-07 Werner Koch <wk at g10code.com>
+
+ * configure.ac (SVN_REVISION): New AC_DEFINE.
+
2008-03-06 Werner Koch <wk at g10code.com>
* doc/gpgol.texi (SIGN): Extend the SIGNER command to allow
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/src/ChangeLog 2008-03-07 11:30:33 UTC (rev 228)
@@ -1,5 +1,9 @@
2008-03-07 Werner Koch <wk at g10code.com>
+ * common.h (opt): Add field SVN_REVISION.
+ * main.c (read_options, write_options): Set it.
+ * olflange.cpp (GpgolExt): Print a warning on program update.
+
* engine.c (struct engine_filter_s): Add field ADD_EXTRA_LF.
(engine_request_exra_lf): New.
(engine_wait): Implement that.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/configure.ac 2008-03-07 11:30:33 UTC (rev 228)
@@ -57,6 +57,7 @@
[Bug report address])
AC_DEFINE_UNQUOTED(NEED_GPGME_VERSION, "$NEED_GPGME_VERSION",
[Required version of GPGME])
+AC_DEFINE_UNQUOTED(SVN_REVISION, ${SVN_REVISION}, [Current SVN revision])
BUILD_TIMESTAMP=`date --iso-8601=minutes`
Modified: trunk/doc/gpgol.texi
===================================================================
--- trunk/doc/gpgol.texi 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/doc/gpgol.texi 2008-03-07 11:30:33 UTC (rev 228)
@@ -671,6 +671,8 @@
Tell how the filter I/O locks the resources.
@item 32 (0x0020)
Tell about resource allocation.
+ at item 64 (0x0040)
+Tell about command events.
@end table
You may use the regular C-syntax for entering the value.
@@ -696,6 +698,12 @@
@itemx HKCU\Software\GNU\GpgOL:preferHtml
These registry keys store the values from the configuration dialog.
+ at item HKCU\Software\GNU\GpgOL:svnRevision
+When leaving GpgOL's options dialog, the SVN revision number of the current
+version will be stored in this entry. This is used to display a note
+after software upgrades.
+
+
@end table
Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/src/common.h 2008-03-07 11:30:33 UTC (rev 228)
@@ -130,6 +130,9 @@
unsigned int auto_decrypt: 1; /* Try to decrypt when clicked. */
unsigned int no_attestation: 1; /* Don't create an attestation. */
} compat;
+
+ /* The SVN revision as stored in the registry. */
+ int svn_revision;
} opt;
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/src/main.c 2008-03-07 11:30:33 UTC (rev 228)
@@ -571,6 +571,10 @@
opt.prefer_html = val == NULL || *val != '1'? 0 : 1;
xfree (val); val = NULL;
+ load_extension_value ("svnRevision", &val);
+ opt.svn_revision = val? atol (val) : 0;
+ xfree (val); val = NULL;
+
/* Note, that on purpose these flags are only Registry changeable.
The format of the entry is a string of of "0" and "1" digits; see
the switch below for a description. */
@@ -643,6 +647,7 @@
{"defaultKey", 2, 0, opt.default_key},
{"enableDefaultKey", 0, opt.enable_default_key},
{"preferHtml", 0, opt.prefer_html},
+ {"svnRevision", 1, opt.svn_revision},
{NULL, 0}
};
char buf[32];
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/src/olflange-dlgs.cpp 2008-03-07 11:30:33 UTC (rev 228)
@@ -1,6 +1,6 @@
/* olflange-dlgs.cpp - New dialogs for Outlook.
* Copyright (C) 2001 G Data Software AG, http://www.gdata.de
- * Copyright (C) 2004, 2005, 2006, 2007 g10 Code GmbH
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008 g10 Code GmbH
*
* This file is part of GpgOL.
*
@@ -298,6 +298,10 @@
opt.prefer_html = !!SendDlgItemMessage
(hDlg, IDC_PREFER_HTML, BM_GETCHECK, 0, 0L);
+ /* Now that the user has confirmed the options dialog, we
+ mark the Registry with revision of this build. */
+ opt.svn_revision = SVN_REVISION;
+
write_options ();
bMsgResult = PSNRET_NOERROR;
break; }
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2008-03-07 10:31:54 UTC (rev 227)
+++ trunk/src/olflange.cpp 2008-03-07 11:30:33 UTC (rev 228)
@@ -334,6 +334,15 @@
g_initdll = TRUE;
log_debug ("%s:%s: first time initialization done\n",
SRCNAME, __func__);
+ if ( SVN_REVISION > opt.svn_revision )
+ MessageBox (NULL,
+ _("You have installed a new version of GpgOL.\n"
+ "\n"
+ "Please open the option dialog and check that"
+ " the settings are correct for your needs. The option"
+ " dialog can be found in the main menu at:"
+ " Extras->Options->GpgOL.\n"),
+ "GpgOL", MB_ICONHAND|MB_OK);
}
}
More information about the Gnupg-commits
mailing list