From 8f2d34d9e0152aded064d15207397d3b6190d8d2 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.ath.cx>
Date: Mon, 12 Apr 2010 20:02:43 +0000
Subject: [PATCH] Fix test_app_server again due to Coding Sprint changes

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36195 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/shared/Jamfile             |  2 +-
 src/kits/shared/StringForSize.cpp   | 21 ++++++++++++---------
 src/kits/storage/QueryPredicate.cpp | 18 ++++++++++++++----
 src/kits/tracker/Jamfile            |  2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 90edf0eac0..ef4a3d58d4 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -4,7 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 AddSubDirSupportedPlatforms libbe_test ;
 
 UseLibraryHeaders agg ;
-UsePrivateHeaders shared ;
+UsePrivateHeaders shared libbe ;
 
 # for RWLockManager only
 UsePrivateSystemHeaders ;
diff --git a/src/kits/shared/StringForSize.cpp b/src/kits/shared/StringForSize.cpp
index 80c9723501..66b1c63fd1 100644
--- a/src/kits/shared/StringForSize.cpp
+++ b/src/kits/shared/StringForSize.cpp
@@ -8,8 +8,9 @@
 #include <stdio.h>
 
 #include <Catalog.h>
-#include <Locale.h>
-#include <LocaleRoster.h>
+#include <LocaleBackend.h>
+using BPrivate::gLocaleBackend;
+using BPrivate::LocaleBackend;
 
 
 namespace BPrivate {
@@ -18,35 +19,37 @@ namespace BPrivate {
 const char*
 string_for_size(double size, char* string, size_t stringSize)
 {
-	BCatalogAddOn* systemCatalog;
-	be_locale_roster->GetSystemCatalog(&systemCatalog);
+	// we need to translate some strings, and in order to do so, we need
+	// to use the LocaleBackend to reache liblocale.so
+	if (gLocaleBackend == NULL)
+		LocaleBackend::LoadBackend();
 	double kib = size / 1024.0;
 	if (kib < 1.0) {
 		snprintf(string, stringSize,
-			systemCatalog->GetString("%d bytes","StringForSize",""),
+			gLocaleBackend->GetString("%d bytes","StringForSize",""),
 			(int)size);
 		return string;
 	}
 	double mib = kib / 1024.0;
 	if (mib < 1.0) {
 		snprintf(string, stringSize,
-			systemCatalog->GetString("%3.2f KiB","StringForSize",""), kib);
+			gLocaleBackend->GetString("%3.2f KiB","StringForSize",""), kib);
 		return string;
 	}
 	double gib = mib / 1024.0;
 	if (gib < 1.0) {
 		snprintf(string, stringSize,
-			systemCatalog->GetString("%3.2f MiB","StringForSize",""), mib);
+			gLocaleBackend->GetString("%3.2f MiB","StringForSize",""), mib);
 		return string;
 	}
 	double tib = gib / 1024.0;
 	if (tib < 1.0) {
 		snprintf(string, stringSize,
-			systemCatalog->GetString("%3.2f GiB","StringForSize",""), gib);
+			gLocaleBackend->GetString("%3.2f GiB","StringForSize",""), gib);
 		return string;
 	}
 	snprintf(string, stringSize,
-		systemCatalog->GetString("%.2f TiB","StringForSize",""), tib);
+		gLocaleBackend->GetString("%.2f TiB","StringForSize",""), tib);
 	return string;
 }
 
diff --git a/src/kits/storage/QueryPredicate.cpp b/src/kits/storage/QueryPredicate.cpp
index 6539c4f7e3..5f38a77fea 100644
--- a/src/kits/storage/QueryPredicate.cpp
+++ b/src/kits/storage/QueryPredicate.cpp
@@ -254,8 +254,13 @@ status_t
 ValueNode<float>::GetString(BString &predicate)
 {
 	char buffer[32];
-	int32 value = *reinterpret_cast<int32*>(&fValue);
-	sprintf(buffer, "0x%08lx", value);
+	union {
+		int32 asInteger;
+		float asFloat;
+	} value;
+	value.asFloat = fValue;
+//	int32 value = *reinterpret_cast<int32*>(&fValue);
+	sprintf(buffer, "0x%08lx", value.asInteger);
 	predicate.SetTo(buffer);
 	return B_OK;
 }
@@ -266,8 +271,13 @@ status_t
 ValueNode<double>::GetString(BString &predicate)
 {
 	char buffer[32];
-	int64 value = *reinterpret_cast<int64*>(&fValue);
-	sprintf(buffer, "0x%016Lx", value);
+	union {
+		int64 asInteger;
+		double asFloat;
+	} value;
+//	int64 value = *reinterpret_cast<int64*>(&fValue);
+	value.asFloat = fValue;
+	sprintf(buffer, "0x%016Lx", value.asInteger);
 	predicate.SetTo(buffer);
 	return B_OK;
 }
diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile
index 049f295e9b..2502779fd3 100644
--- a/src/kits/tracker/Jamfile
+++ b/src/kits/tracker/Jamfile
@@ -91,7 +91,7 @@ SharedLibrary libtracker.so :
 	VolumeWindow.cpp
 	WidgetAttributeText.cpp
 
-	: be translation $(vector_icon_libs) $(TARGET_LIBSTDC++) libshared.a liblocale.so
+	: be translation $(vector_icon_libs) $(TARGET_LIBSTDC++) libshared.a
 
 	;