[Haiku-commits] r30993 - in haiku/branches/components/gsoc-locale-kit: build/jam src/kits/locale

[zooey at BerliOS]

Author: zooey
Date: 2009-06-08 00:23:46 +0200 (Mon, 08 Jun 2009)
New Revision: 30993
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30993&view=rev

Modified:
   haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
   haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
Log:
* applying patch from Adrien that allows proper loading of catalog add-ons

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-06-07 22:19:04 UTC (rev 30992)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-06-07 22:23:46 UTC (rev 30993)
@@ -109,6 +109,7 @@
 	RAWTranslator RTF-Translator SGITranslator STXTTranslator TGATranslator
 	TIFFTranslator WonderBrushTranslator
 ;
+SYSTEM_ADD_ONS_LOCALE_CATALOGS = <catalog-addon>zeta ;
 SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon cortex_flanger.media_addon
 	dvb.media_addon
 	hmulti_audio.media_addon
@@ -452,6 +453,7 @@
 	: Mesa\ Software\ Renderer ;
 AddFilesToHaikuHybridImage system add-ons Translators
 	: $(SYSTEM_ADD_ONS_TRANSLATORS) : : true ;
+AddFilesToHaikuImage system add-ons locale catalogs : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
 AddFilesToHaikuImage system add-ons mail_daemon inbound_protocols : POP3 IMAP ;
 AddFilesToHaikuImage system add-ons mail_daemon outbound_protocols : SMTP ;
 AddFilesToHaikuImage system add-ons mail_daemon inbound_filters : Match\ Header Spam\ Filter R5\ Daemon\ Filter ;

Modified: haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp
===================================================================
--- haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-06-07 22:19:04 UTC (rev 30992)
+++ haiku/branches/components/gsoc-locale-kit/src/kits/locale/LocaleRoster.cpp	2009-06-07 22:23:46 UTC (rev 30993)
@@ -211,7 +211,7 @@
 
 	directory_which folders[] = {
 		B_COMMON_ADDONS_DIRECTORY,
-		B_BEOS_ADDONS_DIRECTORY,
+		B_SYSTEM_ADDONS_DIRECTORY,
 		static_cast<directory_which>(-1)
 	};
 	BPath addOnPath;
@@ -255,11 +255,15 @@
 						if (image >= B_OK) {
 							uint8 *prioPtr;
 							if (get_image_symbol(image, "gCatalogAddOnPriority",
-								B_SYMBOL_TYPE_TEXT, 
+								B_SYMBOL_TYPE_DATA, 
 								(void **)&prioPtr) == B_OK) {
 								priority = *prioPtr;
 								node.WriteAttr(kPriorityAttr, B_INT8_TYPE, 0, 
 									&priority, sizeof(int8));
+							} else {
+								log_team(LOG_ERR, 
+									"couldn't get priority for add-on %s\n", 
+									fullAddOnPath.String());
 							}
 							unload_add_on(image);
 						} else {