From 09a4122e4c67238112a8b3930a84638861d2a342 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Mon, 22 Oct 2007 14:07:26 +0000
Subject: [PATCH] Moved initialization of the system color map from AppServer
 to Desktop

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22661 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/servers/app/AppServer.cpp | 5 -----
 src/servers/app/Desktop.cpp   | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 262862d614..9e8970506e 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -17,7 +17,6 @@
 #include "InputManager.h"
 #include "ScreenManager.h"
 #include "ServerProtocol.h"
-#include "SystemPalette.h"
 
 #include <PortLink.h>
 
@@ -71,10 +70,6 @@ AppServer::AppServer()
 
 	gScreenManager = new ScreenManager();
 	gScreenManager->Run();
-
-	// the system palette needs to be initialized before the desktop,
-	// since it is used there already
-	InitializeColorMap();
 	
 	// Create the bitmap allocator. Object declared in BitmapManager.cpp
 	gBitmapManager = new BitmapManager();
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index e50e3657ae..1af7bd3794 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -23,6 +23,7 @@
 #include "ServerCursor.h"
 #include "ServerScreen.h"
 #include "ServerWindow.h"
+#include "SystemPalette.h"
 #include "WindowPrivate.h"
 #include "WindowLayer.h"
 #include "Workspace.h"
@@ -358,10 +359,15 @@ Desktop::Init()
 	if (fMessagePort < B_OK)
 		return fMessagePort;
 
+	// the system palette needs to be initialized before the
+	// desktop settings, since it is used there already
+	InitializeColorMap();
+
+	const size_t areaSize = B_PAGE_SIZE;
 	char name[B_OS_NAME_LENGTH];
 	snprintf(name, sizeof(name), "d:%d:shared read only", /*id*/0);
 	fSharedReadOnlyArea = create_area(name, (void **)&fServerReadOnlyMemory,
-		B_ANY_ADDRESS, B_PAGE_SIZE, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
+		B_ANY_ADDRESS, areaSize, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
 	if (fSharedReadOnlyArea < B_OK)
 		return fSharedReadOnlyArea;