Revision: 7373
http://mahogany.svn.sourceforge.net/mahogany/?rev=7373&view=rev
Author: nerijus
Date: 2007-09-09 15:15:18 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
fix unix unicode compilation
Modified Paths:
--------------
trunk/M/configure
trunk/M/configure.in
trunk/M/include/Mconfig.h
trunk/M/include/config.h.in
trunk/M/src/adb/ImportMailrc.cpp
trunk/M/src/adb/ImportXFMail.cpp
trunk/M/src/modules/Mdummy.cpp
Modified: trunk/M/configure
===================================================================
--- trunk/M/configure 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/configure 2007-09-09 22:15:18 UTC (rev 7373)
@@ -1268,7 +1268,7 @@
EOF
cat >> confdefs.h <<EOF
-#define M_PREFIX _T("$prefix")
+#define M_PREFIX "$prefix"
EOF
Modified: trunk/M/configure.in
===================================================================
--- trunk/M/configure.in 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/configure.in 2007-09-09 22:15:18 UTC (rev 7373)
@@ -185,7 +185,7 @@
dnl setting the OS type for information
AC_DEFINE_UNQUOTED(M_CANONICAL_HOST,"$host")
AC_DEFINE_UNQUOTED(M_OSINFO,_T("`uname -s -r -m`"))
-AC_DEFINE_UNQUOTED(M_PREFIX,_T("$prefix"))
+AC_DEFINE_UNQUOTED(M_PREFIX,"$prefix")
dnl set the top level directories
dnl use "exec pwd" to avoid shell built-in
Modified: trunk/M/include/Mconfig.h
===================================================================
--- trunk/M/include/Mconfig.h 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/include/Mconfig.h 2007-09-09 22:15:18 UTC (rev 7373)
@@ -153,9 +153,9 @@
/// basic M installation directory
#ifdef OS_UNIX
-# define M_BASEDIR M_PREFIX _T("/share/mahogany")
+# define M_BASEDIR M_PREFIX "/share/mahogany"
#else
-# define M_BASEDIR M_PREFIX _T("\\Mahogany")
+# define M_BASEDIR M_PREFIX "\\Mahogany"
#endif
#ifdef HAVE_COMPFACE_H
Modified: trunk/M/include/config.h.in
===================================================================
--- trunk/M/include/config.h.in 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/include/config.h.in 2007-09-09 22:15:18 UTC (rev 7373)
@@ -102,7 +102,7 @@
/** This define contains the installation prefix where Mahogany
is installed.
*/
-#define M_PREFIX _T("/usr/local")
+#define M_PREFIX "/usr/local"
/** This define contains the full canonical string that specifies
the machine/system/OS/compiler
Modified: trunk/M/src/adb/ImportMailrc.cpp
===================================================================
--- trunk/M/src/adb/ImportMailrc.cpp 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/src/adb/ImportMailrc.cpp 2007-09-09 22:15:18 UTC (rev 7373)
@@ -94,7 +94,7 @@
IMPLEMENT_ADB_IMPORTER(AdbMailrcImporter,
gettext_noop("Unix .mailrc file import module"),
gettext_noop("Unix .mailrc file"),
- _T("Vadim Zeitlin <[EMAIL PROTECTED]>"));
+ "Vadim Zeitlin <[EMAIL PROTECTED]>");
// ----------------------------------------------------------------------------
Modified: trunk/M/src/adb/ImportXFMail.cpp
===================================================================
--- trunk/M/src/adb/ImportXFMail.cpp 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/src/adb/ImportXFMail.cpp 2007-09-09 22:15:18 UTC (rev 7373)
@@ -75,7 +75,7 @@
IMPLEMENT_ADB_IMPORTER(AdbXFMailImporter,
gettext_noop("XFMail address book import module"),
gettext_noop("XFMail address book"),
- _T("Vadim Zeitlin <[EMAIL PROTECTED]>"));
+ "Vadim Zeitlin <[EMAIL PROTECTED]>");
// ----------------------------------------------------------------------------
// AdbXFMailImporter
Modified: trunk/M/src/modules/Mdummy.cpp
===================================================================
--- trunk/M/src/modules/Mdummy.cpp 2007-09-09 21:57:29 UTC (rev 7372)
+++ trunk/M/src/modules/Mdummy.cpp 2007-09-09 22:15:18 UTC (rev 7373)
@@ -39,15 +39,15 @@
MMODULE_BEGIN_IMPLEMENT(DummyModule,
- _T("Mdummy"),
- _T("none"),
- _T("Dummy module for Mahogany"),
- _T("0.00"))
- MMODULE_PROP(_T("description"), _T("This module does not do anything, "
+ "Mdummy",
+ "none",
+ "Dummy module for Mahogany",
+ "0.00")
+ MMODULE_PROP("description", "This module does not do anything, "
"it simply gets loaded, opens a dialog and "
"that's all. It's purpose is to serve as an "
- "example and template for writing real
modules."))
- MMODULE_PROP(_T("author"), _T("Karsten Ballueder <[EMAIL PROTECTED]>"))
+ "example and template for writing real
modules.")
+ MMODULE_PROP("author", "Karsten Ballueder <[EMAIL PROTECTED]>")
MMODULE_END_IMPLEMENT(DummyModule)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
