1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp
index 3eae424..85e5814 100644
--- a/noncore/settings/tabmanager/tabmanager.cpp
+++ b/noncore/settings/tabmanager/tabmanager.cpp
@@ -1,48 +1,48 @@
 #include "tabmanager.h"
 #include "app.h"
 #include "wait.h"
 #include "tabapplnk.h"
 
 #include <opie2/odebug.h>
 
 #include <qpe/applnk.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 
-#define HOME_APP_DIR QPEApplication::qpeDir()+"/apps"
+#define HOME_APP_DIR QPEApplication::qpeDir()+"apps"
 #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info"
 #define NEW_FOLDER "EmptyTab"
 #define NEW_APPLICATION "NewApp"
 #define APPLICATION_EXTENSION ".desktop"
 #define APPLICATION_EXTENSION_LENGTH 8
 
 /**
  * Constructor.  Sets up signals.  Performs initial scan of applications
  * and tabs
  */
 TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false), application(NULL){
   rescanFolder(HOME_APP_DIR);
 
   // Connect the signals and slots
   connect(tabList, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(editItem(QListViewItem*)));
   (tabList->header())->hide();
   connect(tabList, SIGNAL(moveItem(QListViewItem*,QListViewItem*)), this, SLOT(moveApplication(QListViewItem*,QListViewItem*)));
 }
 
 /**
  * If anything in the tab's have been changed then update the system or alert
  * the user.
  */
 TabManager::~TabManager(){
@@ -237,49 +237,49 @@ void TabManager::editCurrentItem(){
 
 /**
  * Edit the item that is passed in.
  * Show application dialog and if anything changed
  * @param item the item to edit.
  */
 void TabManager::editItem( QListViewItem * item){
   if(!item)
     return;
 
   TabAppLnk app(itemList[item]);
   if(!app.isValid()){
     odebug << QString("editItem: Not a valid applnk file: ") + itemList[item].latin1() << oendl;
     return;
   }
 
   // Fill with all of the icons
   if(!application){
     Wait waitDialog(this, "Wait dialog");
     waitDialog.waitLabel->setText(tr("Gathering icons..."));
     waitDialog.show();
     qApp->processEvents();
     application = new AppEdit(this, "Application edit", true);
 
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
     d.setFilter( QDir::Files);
 
     const QFileInfoList *list = d.entryInfoList();
     QFileInfoListIterator it( *list );      // create list iterator
     QFileInfo *fi;                          // pointer for traversing
 
     while ( (fi=it.current()) ) {           // for each file...
       QString fileName = fi->fileName();
       if(fileName.right(4) == ".png"){
         fileName = fileName.mid(0,fileName.length()-4);
         QPixmap imageOfFile(Resource::loadPixmap(fileName));
         QImage foo = imageOfFile.convertToImage();
         foo = foo.smoothScale(16,16);
         imageOfFile.convertFromImage(foo);
         application->iconLineEdit->insertItem(imageOfFile,fileName);
       }
       //odebug << fi->fileName().latin1() << oendl;
       ++it;
     }
     waitDialog.hide();
   }
   int pixmap = -1;
   QString pixmapText = app.pixmapString();
   QComboBox *f = application->iconLineEdit;