5 files changed, 48 insertions, 28 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 759e440..61beac5 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -641,64 +641,65 @@ void TextEdit::findNext() {
 
 void TextEdit::findClose() {
     searchBar->hide();
 }
 
 void TextEdit::search() {
     editor->find( searchEdit->text(), false, false );
 }
 
 void TextEdit::newFile( const DocLnk &f ) {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
     currentFileName = "Unnamed";
     odebug << "newFile "+currentFileName << oendl;
     updateCaption( currentFileName);
 //    editor->setEdited( false);
 }
 
 void TextEdit::openDotFile( const QString &f ) {
     if(!currentFileName.isEmpty()) {
-    currentFileName=f;
-
-    odebug << "openFile dotfile " + currentFileName << oendl;
-    QString txt;
-    QFile file(f);
-    file.open(IO_ReadWrite);
-    QTextStream t(&file);
-    while ( !t.atEnd()) {
-        txt+=t.readLine()+"\n";
-    }
-    editor->setText(txt);
-    editor->setEdited( false);
-    edited1=false;
-    edited=false;
-
-
+        currentFileName=f;
+
+        odebug << "openFile dotfile " + currentFileName << oendl;
+        QString txt;
+        QFile file(f);
+        if (!file.open(IO_ReadWrite))
+            owarn << "Failed to open file " << file.name() << oendl;
+        else {
+            QTextStream t(&file);
+            while ( !t.atEnd()) {
+                txt+=t.readLine()+"\n";
+            }
+            editor->setText(txt);
+            editor->setEdited( false);
+            edited1=false;
+            edited=false;
+        }
     }
     updateCaption( currentFileName);
 }
 
 void TextEdit::openFile( const QString &f ) {
   odebug << "filename is "+ f << oendl;
   QString filer;
   QFileInfo fi( f);
 //    bFromDocView = true;
   if(f.find(".desktop",0,true) != -1 && !openDesktop )
     {
       switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Text Editor has detected<BR>you selected a <B>.desktop</B>file.<BR>Open<B>.desktop</B> file or <B>linked</B> file?"),tr(".desktop File"),tr("Linked Document"),0,1,1) )
         {
         case 0: //desktop
           filer = f;
           break;
         case 1: //linked
           DocLnk sf(f);
           filer = sf.file();
           break;
         };
     }
   else if(fi.baseName().left(1) == "")
     {
diff --git a/core/launcher/qprocess_unix.cpp b/core/launcher/qprocess_unix.cpp
index 97c0460..3125bcc 100644
--- a/core/launcher/qprocess_unix.cpp
+++ b/core/launcher/qprocess_unix.cpp
@@ -292,49 +292,53 @@ void QProcessManager::remove( QProc *p )
     odebug << "QProcessManager: remove process (procList.count(): " << procList->count() << ")" << oendl;
 #endif
     cleanup();
 }
 
 void QProcessManager::cleanup()
 {
     if ( procList->count() == 0 ) {
     QTimer::singleShot( 0, this, SLOT(removeMe()) );
     }
 }
 
 void QProcessManager::removeMe()
 {
     if ( procList->count() == 0 ) {
     qprocess_cleanup_procmanager.remove( &QProcessPrivate::procManager );
     QProcessPrivate::procManager = 0;
     delete this;
     }
 }
 
 void QProcessManager::sigchldHnd( int fd )
 {
     char tmp;
-    ::read( fd, &tmp, sizeof(tmp) );
+    if (::read( fd, &tmp, sizeof(tmp) ) < 0)
+#if defined(QT_QPROCESS_DEBUG)
+        odebug << "QProcessManager::sigchldHnd() failed dummy read of file descriptor" << oendl;
+#endif
+        ;
 #if defined(QT_QPROCESS_DEBUG)
     odebug << "QProcessManager::sigchldHnd()" << oendl;
 #endif
     QProc *proc;
     QProcess *process;
     bool removeProc;
     proc = procList->first();
     while ( proc != 0 ) {
     removeProc = FALSE;
     process = proc->process;
     QProcess *process_exit_notify=0;
     if ( process != 0 ) {
         if ( !process->isRunning() ) {
 #if defined(QT_QPROCESS_DEBUG)
         odebug << "QProcessManager::sigchldHnd() (PID: " << proc->pid << "): process exited (QProcess available)" << oendl;
 #endif
         // read pending data
         int nbytes = 0;
         if ( ::ioctl(proc->socketStdout, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) {
 #if defined(QT_QPROCESS_DEBUG)
         odebug << "QProcessManager::sigchldHnd() (PID: " << proc->pid << "): reading " << nbytes << " bytes of pending data on stdout" << oendl;
 #endif
             process->socketRead( proc->socketStdout );
         }
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 921b790..c45265a 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -346,58 +346,66 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
         QString link;
         stream >> link;
         odebug << "desktop.cpp systemMsg -> linkchanged( " << link << " )" << oendl;
         docList->linkChanged(link);
     } else if (msg =="reforceDocuments()") {
         docList->reforceDocuments();
     } else if ( msg == "serviceChanged(QString)" ) {
         MimeType::updateApplications();
     } else if ( msg == "mkdir(QString)" ) {
         QString dir;
         stream >> dir;
         if ( !dir.isEmpty() )
             mkdir( dir );
     } else if ( msg == "rdiffGenSig(QString,QString)" ) {
         QString baseFile, sigFile;
         stream >> baseFile >> sigFile;
         QRsync::generateSignature( baseFile, sigFile );
     } else if ( msg == "rdiffGenDiff(QString,QString,QString)" ) {
         QString baseFile, sigFile, deltaFile;
         stream >> baseFile >> sigFile >> deltaFile;
         QRsync::generateDiff( baseFile, sigFile, deltaFile );
     } else if ( msg == "rdiffApplyPatch(QString,QString)" ) {
         QString baseFile, deltaFile;
         stream >> baseFile >> deltaFile;
+        bool fileWasCreated = false;
         if ( !QFile::exists( baseFile ) ) {
             QFile f( baseFile );
-            f.open( IO_WriteOnly );
+            fileWasCreated = f.open( IO_WriteOnly );
             f.close();
         }
-        QRsync::applyDiff( baseFile, deltaFile );
+        if ( fileWasCreated ) {
+            QRsync::applyDiff( baseFile, deltaFile );
 #ifndef QT_NO_COP
-        QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
-        e << baseFile;
+            QCopEnvelope e( "QPE/Desktop", "patchApplied(QString)" );
+            e << baseFile;
 #endif
+        } else {
+#ifndef QT_NO_COP
+            QCopEnvelope e( "QPE/Desktop", "patchUnapplied(QString)" );
+            e << baseFile;
+#endif
+        }
     } else if ( msg == "rdiffCleanup()" ) {
         mkdir( "/tmp/rdiff" );
         QDir dir;
         dir.setPath( "/tmp/rdiff" );
         QStringList entries = dir.entryList();
         for ( QStringList::Iterator it = entries.begin(); it != entries.end(); ++it )
             dir.remove( *it );
     } else if ( msg == "sendHandshakeInfo()" ) {
         QString home = getenv( "HOME" );
 #ifndef QT_NO_COP
         QCopEnvelope e( "QPE/Desktop", "handshakeInfo(QString,bool)" );
         e << home;
         int locked = (int) ServerApplication::screenLocked();
         e << locked;
 #endif
     } else  if ( msg == "sendVersionInfo()" ) {
     /*
      * @&$*! Qtopiadesktop relies on the major number
      * to start with 1. (or 2 as the case of version 2.1 will be)
      * we need to fake 1.7 to be able
      * to sync with Qtopiadesktop 1.7.
      * We'll send it Opie's version in the platform string for now,
      * until such time when QD gets rewritten correctly.
      */
@@ -977,30 +985,31 @@ void Server::finishedQueuedRequests()
     // Get rid of the dialog
     if ( syncDialog ) {
         delete syncDialog;
         syncDialog = 0;
     }
 #warning FIXME support TempScreenSaverMode
 #if 0
     QPEApplication::setTempScreenSaverMode(QPEApplication::Enable);
 #endif
     } else {
     qrr->readyToDelete = TRUE;
     QTimer::singleShot( 0, this, SLOT(finishedQueuedRequests()) );
     }
 }
 
 void Server::startSoundServer() {
     if ( !process ) {
         process = new Opie::Core::OProcess( this );
         connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
                 SLOT(soundServerExited()));
     }
 
     process->clearArguments();
     *process << QPEApplication::qpeDir() + "bin/qss";
-    process->start();
+    if (!process->start())
+        owarn << "Sound server process did not start" << oendl;
 }
 
 void Server::soundServerExited() {
     QTimer::singleShot(5000, this, SLOT(startSoundServer()));
 }
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 29ce841..d63b203 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -12,48 +12,49 @@ _;:,   .>  :=|.         This file is free software; you can
   .%`+i>    _;_.
   .i_,=:_.   -<s.       This file is distributed in the hope that
   + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
   : ..  .:,   . . .    without even the implied warranty of
   =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=    =    ;      Public License for more details.
 ++=  -.   .`   .:
 :   = ...= . :.=-        You should have received a copy of the GNU
 -.  .:....=;==+<;          General Public License along with this file;
  -_. . .  )=. =           see the file COPYING. If not, write to the
   --    :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "menusettings.h"
 
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/menuappletinterface.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
 
 #include <qdir.h>
 #include <qlistview.h>
 #include <qcheckbox.h>
 #include <qheader.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
 #include <stdlib.h>
 
 
 MenuSettings::MenuSettings ( QWidget *parent, const char *name )
         : QWidget ( parent, name )
 {
         m_applets_changed = false;
 
         QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
 
         QLabel *l = new QLabel ( tr( "Load applets in O-Menu:" ), this );
         lay-> addWidget ( l );
 
         m_list = new QListView ( this );
         m_list-> addColumn ( "foobar" );
@@ -73,49 +74,51 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
         connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
 
         init ( );
 }
 
 void MenuSettings::init ( )
 {
         Config cfg ( "StartMenu" );
         cfg. setGroup ( "Applets" );
         QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
         QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
         QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
 #else
         QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 #endif /* Q_OS_MACX */
 
         for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
                 QString name;
                 QPixmap icon;
                 MenuAppletInterface *iface = 0;
 
                 QLibrary *lib = new QLibrary ( path + "/" + *it );
-                lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface );
+                QRESULT retVal = QS_OK;
+                if ((retVal = lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**)(&iface) )) != QS_OK )
+                        owarn << "queryInterface failed with " << retVal << oendl;
         if ( iface ) {
                         QString lang = getenv( "LANG" );
                         QTranslator *trans = new QTranslator ( qApp );
                         QString type = (*it). left ((*it). find ("."));
                         QString tfn = QPEApplication::qpeDir ( ) + "i18n/" + lang + "/" + type + ".qm";
                         if ( trans-> load ( tfn ))
                                 qApp-> installTranslator ( trans );
                         else
                                 delete trans;
                         name = iface-> name ( );
                         icon = iface-> icon ( ). pixmap ();
                         iface-> release ( );
                         lib-> unload ( );
 
                         QCheckListItem *item;
                         item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
                         if ( !icon. isNull ( ))
                                 item-> setPixmap ( 0, icon );
                         item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
                         m_applets [*it] = item;
                 } else {
                         delete lib;
                 }
         }
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 861ff3a..c2b82b9 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -70,91 +70,94 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
 
     init ( );
 }
 
 void TaskbarSettings::init ( )
 {
     Config cfg ( "Taskbar" );
     cfg. setGroup ( "Applets" );
     QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
     QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
     QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
 #else
     QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 #endif /* Q_OS_MACX */
 
     for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
         QString name;
         QPixmap icon;
         TaskbarNamedAppletInterface *iface = 0;
 
         owarn << "Load applet: " << (*it) << "" << oendl;
         QLibrary *lib = new QLibrary ( path + "/" + *it );
-        lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
+        QRESULT retVal = QS_OK;
+        if ((retVal = lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**)(&iface) )) != QS_OK)
+            owarn << "<0>" << oendl;
         owarn << "<1>" << oendl;
         if ( iface ) {
             owarn << "<2>" << oendl;
             QString lang = getenv( "LANG" );
             QTranslator *trans = new QTranslator ( qApp );
             QString type = (*it). left ((*it). find ("."));
             QString tfn = QPEApplication::qpeDir ( ) + "i18n/" + lang + "/" + type + ".qm";
             if ( trans-> load ( tfn ))
                 qApp-> installTranslator ( trans );
             else
                 delete trans;
             name = iface-> name ( );
             icon = iface-> icon ( );
             iface-> release ( );
         }
         owarn << "<3>" << oendl;
         if ( !iface ) {
             owarn << "<4>" << oendl;
-            lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
+            if ((retVal = lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**)(&iface))) != QS_OK)
+                owarn << "<5>" << oendl;
 
             if ( iface ) {
-                owarn << "<5>" << oendl;
+                owarn << "<6>" << oendl;
                 name = (*it). mid ( 3 );
                 owarn << "Found applet: " << name << "" << oendl;
 #ifdef Q_OS_MACX
                 int sep = name. find( ".dylib" );
 #else
                 int sep = name. find( ".so" );
 #endif /* Q_OS_MACX */
                 if ( sep > 0 )
                     name. truncate ( sep );
                 sep = name. find ( "applet" );
                 if ( sep == (int) name.length ( ) - 6 )
                     name. truncate ( sep );
                 name[0] = name[0]. upper ( );
                 iface-> release ( );
             }
         }
-        owarn << "<6>" << oendl;
+        owarn << "<7>" << oendl;
 
         if ( iface ) {
-            owarn << "<7>" << oendl;
+            owarn << "<8>" << oendl;
             QCheckListItem *item;
             item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
             if ( !icon. isNull ( ))
                 item-> setPixmap ( 0, icon );
             item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
             m_applets [*it] = item;
         }
         lib-> unload ( );
         delete lib;
     }
 }
 
 void TaskbarSettings::appletChanged()
 {
     m_applets_changed = true;
 }
 
 void TaskbarSettings::accept ( )
 {
     Config cfg ( "Taskbar" );
     cfg. setGroup ( "Applets" );
 
     if ( m_applets_changed ) {
         QStringList exclude;