ooo-build r13798 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Thu Sep  4 15:32:11 2008
New Revision: 13798
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13798&view=rev

Log:
2008-09-04  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-multi-lang-installer.diff
	(setup_native/source/win32/customactions/sellang/sellang.cxx):
	Adjust feature names for 3.0.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff

Modified: branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/win32-multi-lang-installer.diff	Thu Sep  4 15:32:11 2008
@@ -344,7 +344,7 @@
 +
 +	database = MsiGetActiveDatabase(handle);
 +
-+	if (MsiDatabaseOpenViewA(database, "SELECT Feature from Feature WHERE Feature_Parent = 'gm_Langpack_Base'", &view) != ERROR_SUCCESS) {
++	if (MsiDatabaseOpenViewA(database, "SELECT Feature from Feature WHERE Feature_Parent = 'gm_Langpack_Languageroot'", &view) != ERROR_SUCCESS) {
 +		MsiCloseHandle(database);
 +		return ERROR_SUCCESS;
 +	}
@@ -373,10 +373,10 @@
 +		}
 +
 +		/* Keep track of what languages are included in this installer, if
-+		 * it is a multilangiage one.
++		 * it is a multilanguage one.
 +		 */
-+		if (strcmp(feature, "gm_r_en_US") != 0)
-+			strcpy(langs[nlangs++], feature + strlen("gm_r_"));
++		if (strcmp(feature, "gm_Langpack_r_en_US") != 0)
++			strcpy(langs[nlangs++], feature + strlen("gm_Langpack_r_"));
 +
 +		MsiCloseHandle(record);
 +	}
@@ -453,7 +453,7 @@
 +					memcmp(user_locale_lang, langs[i], 2) != 0 &&
 +					!present_in_ui_langs(langs[i])) {
 +					UINT rc;
-+					sprintf(feature, "gm_r_%s", langs[i]);
++					sprintf(feature, "gm_Langpack_r_%s", langs[i]);
 +					rc = MsiSetFeatureStateA(handle, feature, INSTALLSTATE_ABSENT); 
 +					if (rc != ERROR_SUCCESS) {
 +#ifdef VERBOSE_DEBUG_OUTPUT