[Winpt-commits] r381 - trunk/Src

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2011-12-12 13:09:38 +0100 (Mon, 12 Dec 2011)
New Revision: 381

Modified:
   trunk/Src/ChangeLog
   trunk/Src/Makefile.am
   trunk/Src/WinPT-en.rc
Log:
2011-12-12  Timo Schulz  <twoaday at gmx.net>

        * WinPT-en.rc: Remove winpt.org strings. Thanks to Ralf.
	


Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2011-12-11 12:39:08 UTC (rev 380)
+++ trunk/Src/ChangeLog	2011-12-12 12:09:38 UTC (rev 381)
@@ -1,3 +1,7 @@
+2011-12-12  Timo Schulz  <twoaday at gmx.net>
+
+	* WinPT-en.rc: Remove winpt.org strings. Thanks to Ralf.
+
 2011-12-09  Timo Schulz  <twoaday at gmx.net>
 
 	* wptNLS.cpp (gettext_set_user_domain): Changed return type to

Modified: trunk/Src/Makefile.am
===================================================================
--- trunk/Src/Makefile.am	2011-12-11 12:39:08 UTC (rev 380)
+++ trunk/Src/Makefile.am	2011-12-12 12:09:38 UTC (rev 381)
@@ -17,8 +17,11 @@
 AM_CPPFLAGS = -I$(top_srcdir)/Include \
               -I$(top_srcdir)/Gnupg -I$(top_srcdir)/PTD  \
               -DWIN32 -D_WINDOWS -D_MBCS
-AM_CFLAGS   = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
-AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
+#AM_CFLAGS   = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
+#AM_CXXFLAGS = -fstack-protector-all -fexceptions  $(GPGME_CFLAGS)
+
+AM_CFLAGS   = -fexceptions  $(GPGME_CFLAGS)
+AM_CXXFLAGS = -fexceptions  $(GPGME_CFLAGS)
 AM_LDFLAGS  = -mwindows
 
 resource_files = \

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2011-12-11 12:39:08 UTC (rev 380)
+++ trunk/Src/WinPT-en.rc	2011-12-12 12:09:38 UTC (rev 381)
@@ -295,11 +295,11 @@
     GROUPBOX        "Warranty",IDC_ABOUT_GPLINF,6,123,240,91
     LTEXT           "WinPT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABLITY or FITNESS FOR A PARTICULAR PURPOSE. See the General Public License for more details.",
                     IDC_ABOUT_GPL2,10,177,231,34
-    LTEXT           "Please report any BUGS or suggestions for WinPT to <winpt at freakmail.de>",
+    LTEXT           "Please report any BUGS or suggestions for WinPT to <support at gnupt.de>",
                     IDC_ABOUT_BUGS,8,110,247,8
     LTEXT           "A free open source privacy tray for Windows based on GnuPG.",
                     IDC_ABOUT_INFO,8,82,234,8
-    LTEXT           "For more information you can visit the homepage: http://www.winpt.org",
+    LTEXT           "For more information you can visit the homepage: http://winpt.gnupt.org",
                     IDC_ABOUT_URL,8,90,245,8
     LTEXT           "The AUTHORS files contains a list of all contributors and co-authors.",
                     IDC_ABOUT_AUTHORS,6,64,250,8