Remove guidance-specific EXTRA_MODULE_DIR code from this generic module

This resolves Bug 999
(cherry picked from commit ce50b6562b)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 24895f4f32
commit 5ff1926d8b

@ -855,9 +855,6 @@ class BuildKControlModule(Command):
#include <sip.h>
#define MODULE_DIR "%(moduledir)s"
#define EXTRA_MODULE_DIR "/opt/trinity/share/python-support/kde-guidance-trinity"
#define EXTRA_MODULE_DIR_TWO "/opt/trinity/share/python-support/guidance-backends-trinity"
#define EXTRA_MODULE_DIR_THREE "/opt/trinity/share/python-support/kde-guidance-powermanager-trinity"
#define MODULE_NAME "%(modulename)s"
#define FACTORY "%(factoryfunction)s"
#define CPP_FACTORY %(factoryfunction)s
@ -898,18 +895,6 @@ static KCModule* return_instance( QWidget *parent, const char *name ) {
if(!pyize->appendToSysPath (path.latin1 ())) {
return report_error ("***Failed to set sys.path\n");
}
QString extrapath = QString(EXTRA_MODULE_DIR);
if(!pyize->appendToSysPath (extrapath.latin1 ())) {
return report_error ("***Failed to set extra sys.path\n");
}
QString extrapath_two = QString(EXTRA_MODULE_DIR_TWO);
if(!pyize->appendToSysPath (extrapath_two.latin1 ())) {
return report_error ("***Failed to set extra 2 sys.path\n");
}
QString extrapath_three = QString(EXTRA_MODULE_DIR_THREE);
if(!pyize->appendToSysPath (extrapath_three.latin1 ())) {
return report_error ("***Failed to set extra 3 sys.path\n");
}
// Load the Python script.
PyObject *pyModule = pyize->importModule ((char *)script.latin1 ());

Loading…
Cancel
Save