[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kded
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-11-22 12:17:16
[Download RAW message or body]

CVS commit by waba: 

Properly handle relative directories with ".."


  M +12 -2     vfolder_menu.cpp   1.19


--- kdelibs/kded/vfolder_menu.cpp  #1.18:1.19
@@ -613,5 +613,15 @@ VFolderMenu::mergeMenus(QDomElement &doc
          }
 
-         QStringList fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", \
dir+"*.menu", false, false); +         QStringList fileList;
+         if (dir.startsWith("/"))
+         {
+            // Absolute
+            fileList = KGlobal::dirs()->findAllResources("xdgconf-menu", \
dir+"*.menu", false, false); +         }
+         else
+         {
+            // Relative
+            (void) KGlobal::dirs()->findAllResources("xdgconf-menu", dir+"*.menu", \
false, true, fileList); +         }
 
          for(QStringList::ConstIterator it=fileList.begin();
@@ -697,5 +707,5 @@ VFolderMenu::locateMenuFile(const QStrin
    }
 
-   QString baseName = m_docInfo.baseDir + fileName;
+   QString baseName = QDir::cleanDirPath(m_docInfo.baseDir + fileName);
    QString result = locate("xdgconf-menu", baseName);
 


[prev in list] [next in list] [prev in thread] [next in thread]