From be78be4372f7ecdce41d4f6ad6c429d27ceea720 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <sam.spilsbury@canonical.com>
Date: Fri, 24 Jun 2011 12:35:33 +0800
Subject: Add GTK3 Workraround

(bzr r1255.1.2)
---
 plugins/unitydialog/src/unitydialog.cpp | 13 +------------
 plugins/unitydialog/unitydialog_xml.in  |  1 +
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'plugins/unitydialog')

diff --git a/plugins/unitydialog/src/unitydialog.cpp b/plugins/unitydialog/src/unitydialog.cpp
index c852f0878..e1ea9793f 100644
--- a/plugins/unitydialog/src/unitydialog.cpp
+++ b/plugins/unitydialog/src/unitydialog.cpp
@@ -1141,22 +1141,11 @@ UnityDialogScreen::~UnityDialogScreen ()
 
 bool
 UnityDialogPluginVTable::init ()
-{
-    int (*old_handler) (Display *, XErrorEvent *);
-    old_handler = XSetErrorHandler (NULL);
-	
+{	
     if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
 	!CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
 	!CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
 	return false;
 
-    if (!gtk_init_check (&programArgc, &programArgv))
-    {
-	compLogMessage ("unitydialog", CompLogLevelError, "Couldn't initialize gtk");
-	return false;
-    }
-
-    XSetErrorHandler (old_handler);
-
     return true;
 }
diff --git a/plugins/unitydialog/unitydialog_xml.in b/plugins/unitydialog/unitydialog_xml.in
index bb0a40d46..42d9cf024 100644
--- a/plugins/unitydialog/unitydialog_xml.in
+++ b/plugins/unitydialog/unitydialog_xml.in
@@ -7,6 +7,7 @@
 		<requirement>
 			<plugin>composite</plugin>
 			<plugin>opengl</plugin>
+			<plugin>gtkloader</plugin>
 		</requirement>
 		<relation type="after">
 			<plugin>decor</plugin>
-- 
cgit v1.2.3