[git] GpgOL - branch, mime-addin, updated. gpgol-1.2.0-56-g43b9c35
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Oct 14 15:47:00 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, mime-addin has been updated
via 43b9c35e830f7e59082d229a56c823ed0b726473 (commit)
via 4a6e3c3bbccff7026c34cbd93d88604c43382ff4 (commit)
via 4385a90fbb54365e795a5884227582fedf3cc723 (commit)
via 05b4aff708549c0116e7b6ee653faf1e8686ac95 (commit)
from 5d62fdbfc5b0931080efda5aca1f52d18acbb7f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 43b9c35e830f7e59082d229a56c823ed0b726473
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 14 15:46:26 2015 +0200
Remove engine-gpgme.c from potfiles
* POTFILES.in: Remove engine-gpgme.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d78f3a..1076575 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ src/common.c
src/config-dialog.c
src/display.cpp
src/engine.c
-src/engine-gpgme.c
src/engine-assuan.c
src/ext-commands.cpp
src/main.c
commit 4a6e3c3bbccff7026c34cbd93d88604c43382ff4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 14 15:30:57 2015 +0200
Really fix msg merge failures.
* src/Makefile.am: Do not link dialog.o into gpgol.dll. It's
already included in resource.o.
* src/dialogs.h: Remove comment about not using the lower 4 bit.
* src/oomhelp.cpp (put_oom_icon): Update accordingly. (To use +1 again)
--
This fixes the problem 5d62fdbf was supposed to fix.
The "28 bit" ID part was just a red herring. The whole merge
code was triggered because we linked the resources twice into
the dll. Once through dialog.o and once through resource.o
The fix from 5d62fdbf only worked because changes to the id did
not cause the dialog object to be rebuild and so the problem
disappeared for me because dialog.o and resource.o used different
ID's. A clean build triggered the problem again.
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e6aedd..d66c39e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = \
decrypt-16.png decrypt-48.png \
encrypt-sign-file-48.png \
sign-48.png verify-48.png \
- README.icons
+ dialogs.rc README.icons
EXEEXT = .dll
@@ -42,7 +42,7 @@ gpgol_SOURCES = \
olflange.cpp olflange.h \
olflange-def.h \
olflange-dlgs.cpp \
- dialogs.rc dialogs.h \
+ dialogs.h \
myexchext.h \
display.cpp display.h \
message.cpp message.h \
@@ -120,7 +120,7 @@ gpgol_LDADD = $(srcdir)/gpgol.def \
-lole32 -loleaut32 -lws2_32 -ladvapi32 \
-luuid -lgdiplus
-resource.o: resource.rc versioninfo.rc dialogs.rc
+resource.o: resource.rc versioninfo.rc dialogs.rc dialogs.h
.rc.o:
$(WINDRES) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@
diff --git a/src/dialogs.h b/src/dialogs.h
index 747ffc8..81c351b 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -8,28 +8,25 @@
/* Ids used for bitmaps. There is some magic in the identifiers: In
- the code we only use the first ID value and add 16 to find the mask.
- The last 4 bits should always be 0 to avoid problems with ld's resource merge
- code which only uses the first 28 bits as the "name" of the resource
- and tries to merge resource entries with the same name.
+ the code we only use the first ID value and add 1 to find the mask.
*/
#define IDB_ENCRYPT_16 0x1000
-#define IDB_ENCRYPT_16M 0x1010
+#define IDB_ENCRYPT_16M 0x1001
-#define IDB_SIGN_16 0x1100
-#define IDB_SIGN_16M 0x1110
+#define IDB_SIGN_16 0x1010
+#define IDB_SIGN_16M 0x1011
-#define IDB_KEY_MANAGER_16 0x1200
-#define IDB_KEY_MANAGER_16M 0x1210
+#define IDB_KEY_MANAGER_16 0x1020
+#define IDB_KEY_MANAGER_16M 0x1021
-#define IDB_DECRYPT_16 0x1300
-#define IDB_DECRYPT_16M 0x1310
+#define IDB_DECRYPT_16 0x1030
+#define IDB_DECRYPT_16M 0x1031
-#define IDB_VERIFY_16 0x1400
-#define IDB_VERIFY_16M 0x1410
+#define IDB_VERIFY_16 0x1040
+#define IDB_VERIFY_16M 0x1041
-#define IDB_DECRYPT_VERIFY_16 0x1500
-#define IDB_DECRYPT_VERIFY_16M 0x1510
+#define IDB_DECRYPT_VERIFY_16 0x1050
+#define IDB_DECRYPT_VERIFY_16M 0x1051
/* Ids for the extended options dialog. */
diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index 1d8f7da..a04b4be 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -382,7 +382,7 @@ put_oom_icon (LPDISPATCH pDisp, int resource_id, int size)
rc = put_picture_or_mask (pDisp, resource_id, size, 0);
if (!rc)
- rc = put_picture_or_mask (pDisp, resource_id + 16, size, 1);
+ rc = put_picture_or_mask (pDisp, resource_id + 1, size, 1);
return rc;
}
commit 4385a90fbb54365e795a5884227582fedf3cc723
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 14 15:25:13 2015 +0200
Remove unused g10 code logo.
* logo.bmp: Removed.
* Makefile.am (EXTRA_DIST), dialogs.h, dialogs.rc: Update accordingly.
diff --git a/src/Makefile.am b/src/Makefile.am
index 6991d97..5e6aedd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = \
decrypt-16.png decrypt-48.png \
encrypt-sign-file-48.png \
sign-48.png verify-48.png \
- logo.bmp README.icons
+ README.icons
EXEEXT = .dll
diff --git a/src/dialogs.h b/src/dialogs.h
index cec97c5..747ffc8 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -31,10 +31,6 @@
#define IDB_DECRYPT_VERIFY_16 0x1500
#define IDB_DECRYPT_VERIFY_16M 0x1510
-/* Special */
-#define IDB_BANNER 0x3900 /* The g10 Code logo. */
-
-
/* Ids for the extended options dialog. */
#define IDD_EXT_OPTIONS 0x4110
diff --git a/src/dialogs.rc b/src/dialogs.rc
index 1f36da9..45b4628 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -50,8 +50,6 @@ IDB_DECRYPT_VERIFY_16M BITMAP DISCARDABLE "decrypt-verify-16m.bmp"
IDI_ENCSIGN_FILE_48_PNG RCDATA "encrypt-sign-file-48.png"
-IDB_BANNER BITMAP DISCARDABLE "logo.bmp"
-
IDD_GPG_OPTIONS DIALOG DISCARDABLE 0, 0, 266, 274
diff --git a/src/logo.bmp b/src/logo.bmp
deleted file mode 100644
index fa85bfd..0000000
Binary files a/src/logo.bmp and /dev/null differ
commit 05b4aff708549c0116e7b6ee653faf1e8686ac95
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 14 15:00:42 2015 +0200
Fix unused bitmap removal
* src/dialogs.rc: Do not reference the removed files.
* src/Makefile.am (EXTRA_DIST): Do not include the removed files.
--
This was accidentally left out of the previous commit.
diff --git a/src/Makefile.am b/src/Makefile.am
index db5f572..6991d97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,18 +18,11 @@ bin_PROGRAMS = gpgol
EXTRA_DIST = \
versioninfo.rc.in mapi32.def $(unused_sources) Outlook.gpl \
encrypt-16.bmp encrypt-16m.bmp \
- encrypt-32.bmp encrypt-32m.bmp \
sign-16.bmp sign-16m.bmp \
- sign-32.bmp sign-32m.bmp \
key-manager-16.bmp key-manager-16m.bmp \
- key-manager-32.bmp key-manager-32m.bmp \
- key-manager-64.bmp key-manager-64m.bmp \
decrypt-16.bmp decrypt-16m.bmp \
- decrypt-32.bmp decrypt-32m.bmp \
verify-16.bmp verify-16m.bmp \
- verify-32.bmp verify-32m.bmp \
decrypt-verify-16.bmp decrypt-verify-16m.bmp \
- decrypt-verify-32.bmp decrypt-verify-32m.bmp \
encrypt-16.png encrypt-48.png \
key-manager-64.png \
decrypt-16.png decrypt-48.png \
diff --git a/src/dialogs.rc b/src/dialogs.rc
index dc88866..1f36da9 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -25,42 +25,28 @@
IDB_ENCRYPT_16 BITMAP DISCARDABLE "encrypt-16.bmp"
IDB_ENCRYPT_16M BITMAP DISCARDABLE "encrypt-16m.bmp"
-IDB_ENCRYPT_32 BITMAP DISCARDABLE "encrypt-32.bmp"
-IDB_ENCRYPT_32M BITMAP DISCARDABLE "encrypt-32m.bmp"
IDI_ENCRYPT_16_PNG RCDATA "encrypt-16.png"
IDI_ENCRYPT_48_PNG RCDATA "encrypt-48.png"
IDB_SIGN_16 BITMAP DISCARDABLE "sign-16.bmp"
IDB_SIGN_16M BITMAP DISCARDABLE "sign-16m.bmp"
-IDB_SIGN_32 BITMAP DISCARDABLE "sign-32.bmp"
-IDB_SIGN_32M BITMAP DISCARDABLE "sign-32m.bmp"
IDI_SIGN_48_PNG RCDATA "sign-48.png"
IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "key-manager-16.bmp"
IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "key-manager-16m.bmp"
-IDB_KEY_MANAGER_32 BITMAP DISCARDABLE "key-manager-32.bmp"
-IDB_KEY_MANAGER_32M BITMAP DISCARDABLE "key-manager-32m.bmp"
-IDB_KEY_MANAGER_64 BITMAP DISCARDABLE "key-manager-64.bmp"
-IDB_KEY_MANAGER_64M BITMAP DISCARDABLE "key-manager-64m.bmp"
IDI_KEY_MANAGER_64_PNG RCDATA "key-manager-64.png"
IDB_DECRYPT_16 BITMAP DISCARDABLE "decrypt-16.bmp"
IDB_DECRYPT_16M BITMAP DISCARDABLE "decrypt-16m.bmp"
-IDB_DECRYPT_32 BITMAP DISCARDABLE "decrypt-32.bmp"
-IDB_DECRYPT_32M BITMAP DISCARDABLE "decrypt-32m.bmp"
IDI_DECRYPT_16_PNG RCDATA "decrypt-16.png"
IDI_DECRYPT_48_PNG RCDATA "decrypt-48.png"
IDB_VERIFY_16 BITMAP DISCARDABLE "verify-16.bmp"
IDB_VERIFY_16M BITMAP DISCARDABLE "verify-16m.bmp"
-IDB_VERIFY_32 BITMAP DISCARDABLE "verify-32.bmp"
-IDB_VERIFY_32M BITMAP DISCARDABLE "verify-32m.bmp"
IDI_VERIFY_48_PNG RCDATA "verify-48.png"
IDB_DECRYPT_VERIFY_16 BITMAP DISCARDABLE "decrypt-verify-16.bmp"
IDB_DECRYPT_VERIFY_16M BITMAP DISCARDABLE "decrypt-verify-16m.bmp"
-IDB_DECRYPT_VERIFY_32 BITMAP DISCARDABLE "decrypt-verify-32.bmp"
-IDB_DECRYPT_VERIFY_32M BITMAP DISCARDABLE "decrypt-verify-32m.bmp"
IDI_ENCSIGN_FILE_48_PNG RCDATA "encrypt-sign-file-48.png"
-----------------------------------------------------------------------
Summary of changes:
po/POTFILES.in | 1 -
src/Makefile.am | 13 +++----------
src/dialogs.h | 31 ++++++++++++-------------------
src/dialogs.rc | 16 ----------------
src/logo.bmp | Bin 1342 -> 0 bytes
src/oomhelp.cpp | 2 +-
6 files changed, 16 insertions(+), 47 deletions(-)
delete mode 100644 src/logo.bmp
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list