[dia/dia-0-97] Fixed line breaks in installer locale builds. Encoding problem with Korean file.

[Steffen Macke <sdteffen src gnome org>]

commit d698f37df216425f15445e2d1bd5cc2b96af672f
Author: Steffen Macke <sdteffen sdteffen de>
Date:   Fri Jan 28 20:36:57 2011 +0100

    Fixed line breaks in installer locale builds. Encoding problem with Korean file.

 installer/win32/dia.nsi             |    2 +-
 installer/win32/gennsh.c            |    7 ++++---
 installer/win32/locale/makefile.msc |    2 +-
 installer/win32/makefile.msc        |    7 +++++--
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/installer/win32/dia.nsi b/installer/win32/dia.nsi
index 71955f9..10e418a 100644
--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -185,7 +185,7 @@ VIProductVersion "0.97.2.0"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "GERMAN" "locale\german.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "FINNISH" "locale\fi.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "HUNGARIAN" "locale\hungarian.nsh"
-  !insertmacro DIA_MACRO_INCLUDE_LANGFILE "KOREAN" "locale\ko.nsh"
+#  !insertmacro DIA_MACRO_INCLUDE_LANGFILE "KOREAN" "locale\ko.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "SIMPCHINESE" "locale\zh.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "SLOVAK" "locale\slovak.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "SLOVENIAN" "locale\slovenian.nsh"
diff --git a/installer/win32/gennsh.c b/installer/win32/gennsh.c
index a176912..d6603b5 100755
--- a/installer/win32/gennsh.c
+++ b/installer/win32/gennsh.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <libintl.h>
+#include <glib.h>
 
 #define _(String) gettext(String)
 
@@ -71,13 +72,13 @@ int main(int argc, char *argv[])
   printf("!define DIA_UNINSTALL_DESC \"%s\"\n", _("Dia (remove only)"));
 
   /* Installer message: confirmation question. Keep $\r */
-  printf("!define DIA_PROMPT_WIPEOUT \"%s\"\n", _("Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."));
+  printf("!define DIA_PROMPT_WIPEOUT \"%s\"\n", g_strescape(_("Your old Dia directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rDia user settings will not be affected."), ""));
 
   /* Installer message: confirmatin question. Keep $\r */
-  printf("!define DIA_PROMPT_DIR_EXISTS \"%s\"\n", _("The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"));
+  printf("!define DIA_PROMPT_DIR_EXISTS \"%s\"\n", g_strescape(_("The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"), ""));
 
   /* Installer message: Uninstall Section Prompts. Keep $\r */
-  printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s\"\n", _("The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."));
+  printf("!define un.DIA_UNINSTALL_ERROR_1 \"%s\"\n", g_strescape(_("The uninstaller could not find registry entries for Dia.$\rIt is likely that another user installed this application."), ""));
 
   /* Installer message: Uninstall error message */
   printf("!define un.DIA_UNINSTALL_ERROR_2 \"%s\"\n", _("You do not have permission to uninstall this application."));
diff --git a/installer/win32/locale/makefile.msc b/installer/win32/locale/makefile.msc
index 237905b..44d07f4 100755
--- a/installer/win32/locale/makefile.msc
+++ b/installer/win32/locale/makefile.msc
@@ -6,7 +6,7 @@ LOCALEFILES = \
 	eu.nsh \
 	fi.nsh \
 	gl.nsh \
-	ko.nsh \
+#	ko.nsh \
 	zh.nsh
 
 UTF8FILES = \
diff --git a/installer/win32/makefile.msc b/installer/win32/makefile.msc
index 9f4f059..ca8a56c 100755
--- a/installer/win32/makefile.msc
+++ b/installer/win32/makefile.msc
@@ -2,9 +2,12 @@ TOP = ..\..\..
 PRJ_TOP = ..\..
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-PKG_CFLAGS = $(LIBXML2_CFLAGS) 
+PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
+	-I.. -I..\.. \
+	$(GTK2_CFLAGS) \
+	$(LIBXML2_CFLAGS)  
 
-PKG_LINK = $(INTL_LIBS)
+PKG_LINK = $(INTL_LIBS) $(GLIB_LIBS)
 
 LDFLAGS = /link $(LINKDEBUG) /machine:ix86
 INSTALL = copy