fix for rmdir crash

1 files changed, 7 insertions, 4 deletions

diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp
index af76251..f54c837 100644
--- a/noncore/settings/tabmanager/tabmanager.cpp
+++ b/noncore/settings/tabmanager/tabmanager.cpp
@@ -38,49 +38,49 @@
 #include <qtextstream.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #define HOME_APP_DIR QPEApplication::qpeDir()+"/apps" // <-- made this a little more flexible
 #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){
   rescanFolder(HOME_APP_DIR);
 
   // Connect the signals and slots
-  connect(tabList, SIGNAL(doubleClicked(QListViewItem *)), 
+  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(){
   if(changed){
     //QMessageBox::critical(this, tr("Message"), tr("Please restart Qtopia to see all new changes."),tr("Ok") );
     //filename = fn;
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     //e << description << filename << mimetype;
     QString link; //we'll just send an empty string
     e << link;
   }
 }
 
 /**
  * Scans root directory for any tabs or applications.  Will recursivly go down,
  * but will not follow symlinks.
@@ -184,78 +184,81 @@ void TabManager::newApplication(){
 
   system((QString("echo Type=") + folderName + " | cat >> " +  homeLocation).latin1());
 
   // Insert into the tree
   QListViewItem *newItem = new QListViewItem(item, NEW_APPLICATION);
   itemList.insert(newItem, homeLocation );
 
   // We have changed something.
   changed = true;
 }
 
 /**
  * Remove the item.
  * Check if we can
  * Prompt user
  * Delete physical file (Dir, remove .dir, then dir.  File, remove file)
  * Remove from installer if need too.
  */
 void TabManager::removeItem(){
   // Make sure we can delete
   QListViewItem *item = tabList->currentItem();
   if(!item)
     return;
   if(item->childCount() > 0){
-    QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."), 
+    QMessageBox::critical(this, tr("Message"), tr("Can't remove with applications\nstill in the group."),
                           tr("Ok") );
     return;
   }
 
   // Prompt.
   int answer = QMessageBox::warning(this, tr("Message"), tr("Are you sure you want to delete?"),
                                     tr("Yes"), tr("Cancel"), 0, 1 );
   if (answer)
     return;
 
   bool removeSuccessfull = true;
   QString location = itemList[item];
   // Remove file (.directory in a Directory case)
   if(!QFile::remove(location))
       removeSuccessfull = false;
 
   // Remove directory
   if(item->parent() == NULL){
     // Remove .directory file string
     location = location.mid(0,location.length()-10);
     QDir dir;
     if(!dir.rmdir(location))
       removeSuccessfull = false;
+    else
+      removeSuccessfull = true;
+        
   }
 
   // If removing failed.
   if(!removeSuccessfull){
     qDebug((QString("removeItem: ") + location).latin1());
-    QMessageBox::critical(this, tr("Message"), tr("Can't remove."), 
+    QMessageBox::critical(this, tr("Message"), tr("Can't remove."),
                           tr("Ok") );
     return;
   }
 
   // Remove from the installer so it wont fail.
   // Don't need to do this sense the current install uses rm -f so no error
 
   // Remove from the gui list.
   itemList.remove(item);
   if(item->parent())
     item->parent()->takeItem(item);
   delete item;
 
   // We have changed something.
   changed = true;
 }
 
 /**
  * Helper function.  Edits the current item.
  * calls editItem with the currently selected item.
  */
 void TabManager::editCurrentItem(){
   editItem(tabList->currentItem());
 }
@@ -349,49 +352,49 @@ void TabManager::editItem( QListViewItem * item){
  * @param item the application to move
  * @pearam newGroup the new parent of this application
  */
 void TabManager::moveApplication(QListViewItem *item, QListViewItem *newGroup){
   // Can we even move it?
   if(!item || !item->parent() || newGroup->parent())
     return;
   if(item->parent() == newGroup)
     return;
 
   // Get the new folder, new file name,
   QString newFolder = itemList[newGroup];
   newFolder = newFolder.mid(0,newFolder.length()-11);
   int slash = newFolder.findRev('/', -1);
   QString folderName = newFolder.mid(slash+1, newFolder.length());
 
   QString desktopFile = itemList[item];
   slash = desktopFile.findRev('/', -1);
   desktopFile = desktopFile.mid(slash, desktopFile.length());
   newFolder = newFolder + desktopFile;
 
   // Move file
   QDir r;
   if(!r.rename(itemList[item], newFolder)){
-    QMessageBox::critical(this, tr("Message"), tr("Can't move application."), 
+    QMessageBox::critical(this, tr("Message"), tr("Can't move application."),
                           tr("Ok") );
     return;
   }
   //qDebug((QString("moveApplication: ") + itemList[item]).latin1());
   //qDebug((QString("moveApplication: ") + newFolder).latin1());
 
   // Move in the gui
   item->parent()->takeItem(item);
   newGroup->insertItem(item);
   newGroup->setOpen(true);
 
   // Move file in the installer
   QString installedAppFile;
   if(findInstalledApplication(desktopFile, installedAppFile))
     swapInstalledLocation(installedAppFile, desktopFile, newFolder);
   else
     qDebug("moveApplication: No installed app found for dekstop file");
 
   // Move application type
   AppLnk app(newFolder);
   app.setType(folderName);
   app.writeLink();
 
   // Move in our internal list