summaryrefslogtreecommitdiffstats
path: root/opensuse/tdebase/nsplugin-init-gtk.diff
diff options
context:
space:
mode:
Diffstat (limited to 'opensuse/tdebase/nsplugin-init-gtk.diff')
-rw-r--r--opensuse/tdebase/nsplugin-init-gtk.diff49
1 files changed, 49 insertions, 0 deletions
diff --git a/opensuse/tdebase/nsplugin-init-gtk.diff b/opensuse/tdebase/nsplugin-init-gtk.diff
new file mode 100644
index 000000000..882c12443
--- /dev/null
+++ b/opensuse/tdebase/nsplugin-init-gtk.diff
@@ -0,0 +1,49 @@
+--- nsplugins/viewer/nsplugin.h~ 2008-02-13 10:40:38.000000000 +0100
++++ nsplugins/viewer/nsplugin.h 2010-09-22 23:31:58.721961990 +0200
+@@ -315,6 +315,10 @@ private:
+ QPtrList<NSPluginInstance> _trash;
+
+ QCString _app;
++
++ // If plugins use gtk, we call the gtk_init function for them ---
++ // but only do it once.
++ static bool s_initedGTK;
+ };
+
+
+--- nsplugins/viewer/nsplugin.cpp~ 2008-02-13 10:40:38.000000000 +0100
++++ nsplugins/viewer/nsplugin.cpp 2010-09-22 23:31:58.775909705 +0200
+@@ -1330,6 +1330,9 @@ DCOPRef NSPluginViewer::newClass( QStrin
+
+ /****************************************************************************/
+
++bool NSPluginClass::s_initedGTK = false;
++
++typedef void gtkInitFunc(int *argc, char ***argv);
+
+ NSPluginClass::NSPluginClass( const QString &library,
+ QObject *parent, const char *name )
+@@ -1377,6 +1380,23 @@ NSPluginClass::NSPluginClass( const QStr
+
+ // initialize plugin
+ kdDebug(1431) << "Plugin library " << library << " loaded!" << endl;
++
++ // see if it uses gtk
++ if (!s_initedGTK) {
++ gtkInitFunc* gtkInit = (gtkInitFunc*)_handle->symbol("gtk_init");
++ if (gtkInit) {
++ kdDebug(1431) << "Calling gtk_init for the plugin" << endl;
++ // Prevent gtk_init() from replacing the X error handlers, since the Gtk
++ // handlers abort when they receive an X error, thus killing the viewer.
++ int (*old_error_handler)(Display*,XErrorEvent*) = XSetErrorHandler(0);
++ int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0);
++ gtkInit(0, 0);
++ XSetErrorHandler(old_error_handler);
++ XSetIOErrorHandler(old_io_error_handler);
++ s_initedGTK = true;
++ }
++ }
++
+ _constructed = true;
+ _error = initialize()!=NPERR_NO_ERROR;
+ }