summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/acinclude.m4.in21
-rw-r--r--config.h.in4
-rw-r--r--src/kvilib/core/kvi_pointerhashtable.h2
-rw-r--r--src/kvirc/kernel/kvi_app_fs.cpp30
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp12
-rw-r--r--src/modules/snd/libkvisnd.cpp2
6 files changed, 48 insertions, 23 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index abc25a3..78049d4 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2121,12 +2121,12 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-ltdecore -ltdeui -ltdeparts -lDCOP -ltdefx -ltdeio $SS_LIBLINK"
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
- AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support])
- AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([BASE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([BASE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support])
SS_BUILD_FLAGS="k$SS_BUILD_FLAGS"
else
- AC_DEFINE_UNQUOTED([TDE_DIR], "", [contain path to TDE if compiled with the TDE support])
- AC_DEFINE_UNQUOTED([TDE_LIBDIR], "", [contain path to TDE libs if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([BASE_DIR], "${prefix}", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([BASE_LIBDIR], "${prefix}/lib", [contain path to TDE libs if compiled with the TDE support])
fi
if test -n "$SS_OTHER_LIBLINK"; then
@@ -2180,7 +2180,12 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
fi
done
- globalkvircdir="\${datadir}/apps/kvirc"
+ if test "$SS_KDE_REQUESTED" = "yes"; then
+ globalkvircdir="\${datadir}/apps/kvirc"
+ else
+ globalkvircdir="\${datadir}/kvirc"
+ fi
+
AC_SUBST(globalkvircdir)
configdir="\${globalkvircdir}/config"
@@ -2271,7 +2276,11 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
AC_SUBST(xdg_apps)
AC_SUBST(mimelnkdir)
- localedir="\${datadir}/locale"
+ if test "$SS_KDE_REQUESTED" = "yes"; then
+ localedir="\${datadir}/locale"
+ else
+ localedir="\${globalkvircdir}/locale"
+ fi
AC_SUBST(localedir)
headersdir="\${exec_prefix}/include/kvirc"
diff --git a/config.h.in b/config.h.in
index 4c87ab7..c4b6779 100644
--- a/config.h.in
+++ b/config.h.in
@@ -136,7 +136,7 @@
#undef VERSION
/* TDE directory */
-#undef TDE_DIR
+#undef BASE_DIR
/* TDE Library directory */
-#undef TDE_LIBDIR
+#undef BASE_LIBDIR
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index d7e8475..5617c45 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -96,7 +96,7 @@ inline void kvi_hash_key_copy(const char * const &szFrom,const char * &szTo,bool
inline void kvi_hash_key_destroy(const char * &szKey,bool bDeepCopy)
{
if(bDeepCopy)
- kvi_free(szKey);
+ kvi_free((void*)szKey);
}
inline const char * & kvi_hash_key_default(const char **)
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index cd80567..a592cb1 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -38,7 +38,9 @@
#include <tqdir.h>
#include <tqfileinfo.h>
#include <tqdatetime.h>
+#ifdef COMPILE_TDE_SUPPORT
#include <tdestandarddirs.h>
+#endif
#include "config.h"
@@ -53,14 +55,14 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
switch(dir)
{
- case None : break;
- case Pics : szData.append("pics"); break;
+ case None : break;
+ case Pics : szData.append("pics"); break;
// Local hack for Debian
case Modules :
- case Plugins : szData = TDE_LIBDIR "/kvirc/modules"; break;
+ case Plugins : szData = BASE_LIBDIR "/kvirc/modules"; break;
- case EasyPlugins : szData.append("easyplugins"); break;
+ case EasyPlugins : szData.append("easyplugins"); break;
case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
case ConfigScripts : KviTQString::appendFormatted(szData,"config%sscripts",KVI_PATH_SEPARATOR); break;
case Help :
@@ -77,11 +79,11 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
}
}
break;
- case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break;
+ case HelpEN : KviTQString::appendFormatted(szData,"help%sen",KVI_PATH_SEPARATOR); break;
case HelpNoIntl : szData.append("help"); break;
- case Log : tqDebug("WARNING Global log directory requested!"); break;
- case Incoming : tqDebug("WARNING Global incoming directory requested!"); break;
- case Trash : tqDebug("WARNING Global trash directory requested!"); break;
+ case Log : tqDebug("WARNING Global log directory requested!"); break;
+ case Incoming : tqDebug("WARNING Global incoming directory requested!"); break;
+ case Trash : tqDebug("WARNING Global trash directory requested!"); break;
case Config : szData.append("config"); break;
case Audio : szData.append("audio"); break;
case Scripts : szData.append("scripts"); break;
@@ -91,11 +93,17 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
case DefScript : szData.append("defscript"); break;
case License : szData.append("license"); break;
case Filters : szData.append("filters"); break;
- case Locale : szData=locate("locale",""); break;
- case Tmp : tqDebug("WARNING Global tmp directory requested!"); break;
+ case Locale :
+#ifdef COMPILE_TDE_SUPPORT
+ szData=locate("locale","");
+#else
+ szData.append("locale");
+#endif
+ break;
+ case Tmp : tqDebug("WARNING Global tmp directory requested!"); break;
case Themes : szData.append("themes"); break;
case Classes : szData.append("classes"); break;
- case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break;
+ case SmallIcons : szData.append("pics" KVI_PATH_SEPARATOR KVI_SMALLICONS_SUBDIRECTORY); break;
}
if(!appendFile.isEmpty())
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 8a94def..b37d614 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -500,7 +500,7 @@ void KviApp::setupFileAssociations()
#ifndef COMPILE_ON_WINDOWS
const char * usualKvircGlobalPrePath[]=
{
- TDE_DIR,
+ BASE_DIR,
"/usr/local", "/opt/kde", "/usr",
"/usr/local/lib", "/opt/kde3", "/usr/lib",
"/usr/local/kde", "/opt", "/usr/etc",
@@ -705,7 +705,15 @@ void KviApp::loadDirectories()
// First find the global (readable) one...
findGlobalKvircDirectory();
// Init locale
- TQString szLocalePath = locate("locale","");
+ TQString szLocalePath = TQString::null;
+#ifdef COMPILE_TDE_SUPPORT
+ szLocalePath = locate("locale","");
+#else
+ szLocalePath = m_szGlobalKvircDir;
+ szLocalePath.append(KVI_PATH_SEPARATOR);
+ szLocalePath.append("locale");
+ szLocalePath.append(KVI_PATH_SEPARATOR);
+#endif
KviLocale::init(this,szLocalePath);
//__debug_1arg("Global Kvirc directory is %s",m_szGlobalKvircDir.ptr());
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 7f0db3f..4f9f929 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -67,7 +67,7 @@
#endif //COMPILE_OSS_SUPPORT
#ifdef COMPILE_ARTS_SUPPORT
- #include <arts/soundserver.h>
+ #include <soundserver.h>
static Arts::Dispatcher * g_pArtsDispatcher = 0;
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-02 08:02:06 +0000