Merge lp:~unity-team/unity/unity.fix_801428 into lp:unity

[Sam Spilsbury]

Fixes LP#801428 , work around a hang in gtk when doing gtk_init_check from multiple dlopen contexts

[Marco Biscaro (marcobiscaro2112)]

Some minor details:

+ XSetErrorHandler (old_handler);

You're calling this method twice. I think it should be called just once, after loading gtk, right?

+ compLogMessage ("unitydialog", CompLogLevelError, "Couldn't initialize gtk");

The compiz plugin here is gtkloader, not unitydialog.

+bool
+GTKLoaderPluginVTable::init ()

The method should return a bool, even when the plugin is loaded successfully. This means that you should add a 'return true' as the last line of method (GCC 4.6 generates a warning about this).

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Thanks Marco!

[Marco Biscaro (marcobiscaro2112)]

Looks good! +1

review: Approve

=== added directory 'plugins/gtkloader'
=== added file 'plugins/gtkloader/CMakeLists.txt'
--- plugins/gtkloader/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/gtkloader/CMakeLists.txt	2011-06-27 10:52:55 +0000
@@ -0,0 +1,5 @@
+find_package (Compiz REQUIRED)
+
+include (CompizPlugin)
+
+compiz_plugin (gtkloader PKGDEPS gtk+-3.0)

=== added file 'plugins/gtkloader/gtkloader.xml.in'
--- plugins/gtkloader/gtkloader.xml.in	1970-01-01 00:00:00 +0000
+++ plugins/gtkloader/gtkloader.xml.in	2011-06-27 10:52:55 +0000
@@ -0,0 +1,7 @@
+<compiz>
+	<plugin name="gtkloader" useBcop="true">
+		<_short>GTK Loader</_short>
+		<_long>Initializes GTK once</_long>
+		<category>Utility</category>
+	</plugin>
+</compiz>

=== added directory 'plugins/gtkloader/src'
=== added file 'plugins/gtkloader/src/gtkloader.cpp'
--- plugins/gtkloader/src/gtkloader.cpp	1970-01-01 00:00:00 +0000
+++ plugins/gtkloader/src/gtkloader.cpp	2011-06-27 10:52:55 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtkloader.h"
+
+COMPIZ_PLUGIN_20090315 (gtkloader, GTKLoaderPluginVTable);
+
+GTKLoaderScreen::GTKLoaderScreen (CompScreen *screen) :
+    PluginClassHandler <GTKLoaderScreen, CompScreen> (screen)
+{
+}
+
+bool
+GTKLoaderPluginVTable::init ()
+{
+    int (*old_handler) (Display *, XErrorEvent *);
+    old_handler = XSetErrorHandler (NULL);
+
+    XSetErrorHandler (old_handler);
+
+    if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
+	return false;
+
+    if (!gtk_init_check (&programArgc, &programArgv))
+    {
+	compLogMessage ("gtkloader", CompLogLevelError, "Couldn't initialize gtk");
+	return false;
+    }
+
+    return true;
+}

=== added file 'plugins/gtkloader/src/gtkloader.h'
--- plugins/gtkloader/src/gtkloader.h	1970-01-01 00:00:00 +0000
+++ plugins/gtkloader/src/gtkloader.h	2011-06-27 10:52:55 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include <gtk/gtk.h>
+#include <core/core.h>
+#include <X11/Xatom.h>
+#include <X11/Xproto.h>
+#include <core/pluginclasshandler.h>
+
+#include "gtkloader_options.h"
+
+class GTKLoaderScreen :
+    public PluginClassHandler <GTKLoaderScreen, CompScreen>,
+    public GtkloaderOptions
+{
+    public:
+
+	GTKLoaderScreen (CompScreen *);
+};
+
+class GTKLoaderPluginVTable :
+    public CompPlugin::VTableForScreen <GTKLoaderScreen>
+{
+    public:
+
+	bool init ();
+};

=== modified file 'plugins/unitydialog/CMakeLists.txt'
--- plugins/unitydialog/CMakeLists.txt	2011-05-20 17:08:22 +0000
+++ plugins/unitydialog/CMakeLists.txt	2011-06-27 10:52:55 +0000
@@ -2,5 +2,5 @@
 
 include (CompizPlugin)
 
-compiz_plugin (unitydialog PLUGINDEPS composite opengl PKGDEPS cairo cairo-xlib-xrender gtk+-2.0)
+compiz_plugin (unitydialog PLUGINDEPS composite opengl PKGDEPS cairo cairo-xlib-xrender gtk+-3.0)
 

=== modified file 'plugins/unitydialog/src/unitydialog.cpp'
--- plugins/unitydialog/src/unitydialog.cpp	2011-06-09 12:29:00 +0000
+++ plugins/unitydialog/src/unitydialog.cpp	2011-06-27 10:52:55 +0000
@@ -1141,22 +1141,11 @@
 
 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;
 }

=== modified file 'plugins/unitydialog/unitydialog.xml.in'
--- plugins/unitydialog/unitydialog.xml.in	2011-06-09 12:37:04 +0000
+++ plugins/unitydialog/unitydialog.xml.in	2011-06-27 10:52:55 +0000
@@ -7,6 +7,7 @@
 		<requirement>
 			<plugin>composite</plugin>
 			<plugin>opengl</plugin>
+			<plugin>gtkloader</plugin>
 		</requirement>
 		<relation type="after">
 			<plugin>decor</plugin>

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-06-12 23:21:36 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-06-27 10:52:55 +0000
@@ -846,8 +846,6 @@
 
   unity_a11y_preset_environment ();
 
-  gtk_init (NULL, NULL);
-
   XSetErrorHandler (old_handler);
 
   /* Wrap compiz interfaces */

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2011-06-20 20:46:03 +0000
+++ plugins/unityshell/unityshell.xml.in	2011-06-27 10:52:55 +0000
@@ -34,6 +34,7 @@
             <requirement>
                 <plugin>opengl</plugin>
                 <feature>largedesktop</feature>
+		<plugin>gtkloader</plugin>
             </requirement>
         </deps>
         <options>