From 9254af1656275b3de2273cbee6594df5960f96fe Mon Sep 17 00:00:00 2001
From: Sravan Sandela <sravan.sandela@palm.com>
Date: Thu, 4 Oct 2012 16:39:31 -0700
Subject: [PATCH] Ensure flash plugin inits gtk on desktop

This fix prevents browser crash on x64 desktop build.
Committing this on behalf of ERIC BLADE

Change-Id: Ia42d9c246048fdbda3db0ff366e49ebd404bb13c
---
 Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
index c300a829cce..23168312ceb 100644
--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
@@ -108,7 +108,7 @@ static void initializeGtk(QLibrary* module = 0)
         if (gtkInit) {
             // Prevent gtk_init() from replacing the X error handlers, since the Gtk
             // handlers abort when they receive an X error, thus killing the viewer.
-#if !PLATFORM(WEBOS)
+#if !PLATFORM(WEBOS) || defined(MACHINE_DESKTOP)
 #ifdef Q_WS_X11
             int (*old_error_handler)(Display*, XErrorEvent*) = XSetErrorHandler(0);
             int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);