From 2663d9c712f5fa9e707b98e4ea41fe50c99585e8 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 31 Mar 2012 09:25:38 -0400 Subject: [PATCH] Allow --profile=full path to work again. After 8240973baf59036030dc60aa93bad9489f05bccb, using full paths in --profile didn't work. This fixes that issue. It will save the full profile path for favorites and shortcuts if the profile is not under the normal KDE konsole area. CCBUG: 283102 --- src/ProfileManager.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index 1c3181f6d..d05fc45e9 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -473,7 +473,16 @@ void ProfileManager::saveShortcuts() QString profileName; if (fileInfo.isAbsolute()) { - profileName = fileInfo.fileName(); + // Check to see if file is under KDE's data locations. If not, + // store full path. + QString location = KGlobal::dirs()->locate("data", + "konsole/"+fileInfo.fileName()); + if (location.isEmpty()) + { + profileName = iter.value().profilePath; + } else { + profileName = fileInfo.fileName(); + } } else { profileName = iter.value().profilePath; } @@ -550,7 +559,16 @@ void ProfileManager::saveFavorites() if (fileInfo.isAbsolute()) { - profileName = fileInfo.fileName(); + // Check to see if file is under KDE's data locations. If not, + // store full path. + QString location = KGlobal::dirs()->locate("data", + "konsole/"+fileInfo.fileName()); + if (location.isEmpty()) + { + profileName = profile->path(); + } else { + profileName = fileInfo.fileName(); + } } else { profileName = profile->path(); }