1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
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;
}
|
