View | Details | Raw Unified | Return to bug 140485
Collapse All | Expand All

(-)nsplugins/pluginscan.cpp.sav (+12 lines)
Lines 54-59 Link Here
54
#include <klocale.h>
54
#include <klocale.h>
55
55
56
#include "sdk/npupp.h"
56
#include "sdk/npupp.h"
57
#include <X11/Intrinsic.h>
57
58
58
static int showProgress=0;
59
static int showProgress=0;
59
60
Lines 93-98 extern "C" void __pure_virtual() Link Here
93
}
94
}
94
#endif
95
#endif
95
96
97
// The only purpose of this function is just to pull in libXt.
98
// Using --enable-new-ldflags makes the linker use --as-needed and since
99
// otherwise nspluginscan wouldn't actually use libXt it wouldn't be really
100
// linked against it. However some plugins are not linked against libXt
101
// yet expect to have it available in the hosting application.
102
void pullInXt()
103
{
104
    XtFree( NULL );
105
}
106
96
KConfig *infoConfig = 0;
107
KConfig *infoConfig = 0;
97
108
98
109
Lines 585-590 int main( int argc, char **argv ) Link Here
585
596
586
    sigaction( SIGCHLD, &act, 0 );
597
    sigaction( SIGCHLD, &act, 0 );
587
598
599
    pullInXt();
588
600
589
    // set up the paths used to look for plugins
601
    // set up the paths used to look for plugins
590
    QStringList searchPaths = getSearchPaths();
602
    QStringList searchPaths = getSearchPaths();

Return to bug 140485