diff options
Diffstat (limited to 'src/modules/setup')
| -rw-r--r-- | src/modules/setup/Makefile.am | 2 | ||||
| -rw-r--r-- | src/modules/setup/libkvisetup.cpp | 4 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/setup/Makefile.am b/src/modules/setup/Makefile.am index 73e3bcec..7634b3fc 100644 --- a/src/modules/setup/Makefile.am +++ b/src/modules/setup/Makefile.am @@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvisetup.la libkvisetup_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS) libkvisetup_la_SOURCES = libkvisetup.cpp setupwizard.cpp -libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la +libkvisetup_la_LIBADD = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la noinst_HEADERS= setupwizard.h diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp index 33184cc1..af8e0360 100644 --- a/src/modules/setup/libkvisetup.cpp +++ b/src/modules/setup/libkvisetup.cpp @@ -53,7 +53,7 @@ TQString szMircIni; // this is called by KviApp when no local kvirc directory has been found // we have nothing to rely on yet... (settings have not been loaded yet) -KVIMODULEEXPORTFUNC bool setup_begin() +extern "C" KVIMODULEEXPORTFUNC bool setup_begin() { // FIXME: try to guess the user's .kvirc directory // and the preferred nickname from a previous installation @@ -69,7 +69,7 @@ KVIMODULEEXPORTFUNC bool setup_begin() // all the subsystems are up and running (we even have a nice console // to write on if needed). // all the options are loaded. -KVIMODULEEXPORTFUNC void setup_finish() +extern "C" KVIMODULEEXPORTFUNC void setup_finish() { if(bNeedToApplyDefaults) { diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index b08de956..3cf36461 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -191,7 +191,7 @@ KviSetupWizard::KviSetupWizard() ed->setWordWrap(KviTalTextEdit::NoWrap); TQString szLicense; TQString szLicensePath; - g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); if(!KviFileUtils::loadFile(szLicensePath,szLicense)) { szLicense = __tr("Oops... can't find the license file.\n" \ |