summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-05-24 19:53:58 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-05-24 19:54:49 +0900
commit00dfa3aec6f891f88ca73219d5d6859b67b3b651 (patch)
treede6a77fff66241339b871d153ba565ebacb4e2c4
parent301796c02e69296ff7adc300c4bc595780900ddf (diff)
downloadtdebase-00dfa3ae.tar.gz
tdebase-00dfa3ae.zip
Fixed update of network links in user folder. This resolves bug 2903.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--konqueror/sidebar/trees/konq_sidebartree.cpp45
-rw-r--r--r14-xdg-update26
2 files changed, 46 insertions, 25 deletions
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 0ce4c204..514c2809 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -599,28 +599,26 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
if ( isRoot )
{
- bool copyConfig = ( entries.count() == 0 && dirEntries.count() == 0 );
- if (!copyConfig)
- {
- // Check version number
- // Version 1 was the dirtree of KDE 2.0.x (no versioning at that time, so default)
- // Version 2 includes the history
- // Version 3 includes the bookmarks
- // Version 4 includes lan.desktop and floppy.desktop, Alex
- // Version 5 includes the audiocd browser
- // Version 6 includes the printmanager and lan browser
- const int currentVersion = 6;
- TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber");
- KSimpleConfig versionCfg( path + "/.directory" );
- int versionNumber = versionCfg.readNumEntry( key, 1 );
- kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
- if ( versionNumber < currentVersion )
- {
- versionCfg.writeEntry( key, currentVersion );
- versionCfg.sync();
- copyConfig = true;
- }
- }
+ bool copyConfig = false;
+ // Check version number
+ // Version 1 was the dirtree of KDE 2.0.x (no versioning at that time, so default)
+ // Version 2 includes the history
+ // Version 3 includes the bookmarks
+ // Version 4 includes lan.desktop and floppy.desktop, Alex
+ // Version 5 includes the audiocd browser
+ // Version 6 includes the printmanager and lan browser
+ // Version 7 includes update of network places
+ const int currentVersion = 7;
+ TQString key = TQString::fromLatin1("X-TDE-DirTreeVersionNumber");
+ KSimpleConfig versionCfg( path + "/.directory" );
+ int versionNumber = versionCfg.readNumEntry( key, 0 );
+ kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
+ if ( versionNumber < currentVersion )
+ {
+ versionCfg.writeEntry( key, currentVersion );
+ versionCfg.sync();
+ copyConfig = true;
+ }
if (copyConfig)
{
// We will copy over the configuration for the dirtree, from the global directory
@@ -655,8 +653,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
for (; eIt != eEnd; ++eIt )
{
//kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl;
- if ( *eIt != "." && *eIt != ".."
- && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) )
+ if ( *eIt != "." && *eIt != "..")
{ // we don't have that one yet -> copy it.
TQString cp("cp -R -- ");
cp += TDEProcess::quote(dirtree_dir + *eIt);
diff --git a/r14-xdg-update b/r14-xdg-update
index 86d42938..94961a65 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -3,7 +3,7 @@
# A script to perform R14.0.0 XDG compliance updates.
SCRIPT_NAME="`basename \`readlink -f $0\``"
-SCRIPT_VERSION=201412270
+SCRIPT_VERSION=201805230
# This script should be needed to run only once, but corner cases
# and file/directory permissions could cause incomplete updates.
@@ -947,6 +947,26 @@ if [ "$R14_VERSION" -lt "201412270" ]; then
fi
fi
+# Rename/remove old link files in Konqueror sidebar network panel.
+# Updated links will be installed when the user open the panel from Konqueror
+if [ "$R14_VERSION" -lt "201805230" ]; then
+ if [ -f "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop" ]; then
+ Log " kde_ftp.desktop->tde_ftp.desktop"
+ mv "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop" \
+ "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/ftp/tde_ftp.desktop" 2>/dev/null
+ fi
+ if [ -f "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop" ]; then
+ Log " kde_web.desktop->tde_web.desktop"
+ mv "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop" \
+ "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/web/tde_web.desktop" 2>/dev/null
+ fi
+ if [ -f "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop" ]; then
+ Log " Remove look_web.desktop"
+ rm "$PROFILE_DIR/share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop" 2>/dev/null
+ fi
+fi
+
+
# Perform some nominal update validations.
# First clean house from any previous failures.
if [ "$CACHE_DIR" = "" ]; then
@@ -1117,6 +1137,10 @@ unset R14_UPDATE_TEST3
unset R14_UPDATE_TEST4
unset R14_UPDATE_TEST5
unset R14_UPDATE_TEST6
+unset R14_UPDATE_TEST7
+unset R14_UPDATE_TEST8
+unset R14_UPDATE_TEST9
+unset R14_UPDATE_TEST10
unset KDEGLOBALS_KEY_VALUE
unset TEST_NUM
unset SCRIPT_NAME