Fix kvirc FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1249212 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 5fd1e9ef91
commit ac624916d5

@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi fi
ss_kde_general_test_path_suffix="kde trinity.0 trinity KDE Kde KDE3 trinity ." ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR) AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)

@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi fi
ss_kde_general_test_path_suffix="kde trinity.0 trinity KDE Kde KDE3 trinity ." ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR) AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)

@ -55,7 +55,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
// Local hack for Debian // Local hack for Debian
case Modules : case Modules :
case Plugins : szData = "/opt/trinity/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break; case Plugins : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/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 ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;

@ -501,11 +501,11 @@ void KviApp::setupFileAssociations()
const char * usualKvircGlobalPrePath[]= const char * usualKvircGlobalPrePath[]=
{ {
"/usr/local", "/opt/kde", "/usr", "/usr/local", "/opt/kde", "/usr",
"/usr/local/lib", "/opt/trinity", "/usr/lib", "/usr/local/lib", "/opt/kde3", "/usr/lib",
"/usr/local/kde", "/opt", "/usr/etc", "/usr/local/kde", "/opt", "/usr/etc",
"/usr/local/trinity", "/usr/lib/X11R6", "/usr/X11R6", "/usr/local/kde3", "/usr/lib/X11R6", "/usr/X11R6",
"/usr/local/X11R6", "/lib/X11", "/usr/kde", "/usr/local/X11R6", "/lib/X11", "/usr/kde",
"/usr/local/X11", "/etc", "/usr/trinity", "/usr/local/X11", "/etc", "/usr/kde3",
"/usr/local/etc", "/lib", "/usr/X11", "/usr/local/etc", "/lib", "/usr/X11",
"/etc/X11", "/home", "/home/kvirc", "/etc/X11", "/home", "/home/kvirc",
0 0

Loading…
Cancel
Save