Fixing up splash_xpm for phoenix builds on Linux. Not part of the default build.

xpfe/bootstrap/nsAppRunner.cpp

@@ -329,6 +329,9 @@ static void InitializeMacOSXApp(int argc, char* argv[])
 
 #ifdef MOZ_WIDGET_GTK
 #include <gtk/gtk.h>
+#ifdef MOZ_PHOENIX
+#include SPLASH_XPM
+#endif
 #endif //MOZ_WIDGET_GTK
 
 /* Define Class IDs */

xpfe/bootstrap/nsNativeAppSupportGtk.cpp

@@ -25,7 +25,11 @@
 
 #include "nsNativeAppSupportBase.h"
 #include "gdk/gdk.h"
+#ifdef MOZ_PHOENIX
+extern char* splash_xpm[];
+#else
 #include SPLASH_XPM
+#endif
 
 class nsSplashScreenGtk : public nsISplashScreen {
 public:
@@ -61,6 +65,10 @@ nsSplashScreenGtk::~nsSplashScreenGtk()
 
 NS_IMETHODIMP nsSplashScreenGtk::Show()
 {
+#ifdef MOZ_PHOENIX
+  if (!splash_xpm[0])
+    return NS_OK;
+#endif
   /* create a pixmap based on xpm data */
   GdkPixmap* pmap = gdk_pixmap_colormap_create_from_xpm_d(NULL,
                                                     gdk_colormap_get_system(),

xpfe/bootstrap/splash.xpm

@@ -1,5 +1,9 @@
 /* XPM */
+#ifdef MOZ_PHOENIX
+char * splash_xpm[] = {
+#else
 static char * splash_xpm[] = {
+#endif
 "390 261 257 2",
 "  	c None",
 ". 	c #000000",