3 files changed, 8 insertions, 122 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1074a62..c4382d6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -367,48 +367,50 @@ void KABCore::toggleBeamReceive( )
 }
 
 
 void KABCore::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive( );
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //toggleBeamReceive( );
         }
     }
 #endif
 
 }
 void KABCore::recieve( QString fn  )
 {
     //qDebug("KABCore::recieve ");
     int count = mAddressBook->importFromFile( fn, true );
+    if ( count )
+        setModified( true );
     mViewManager->refreshView();
     message(i18n("%1 contact(s) received!").arg( count ));
     topLevelWidget()->showMaximized();
     topLevelWidget()->raise();
 }
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
 
   state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
 /*US
@@ -2858,46 +2860,48 @@ bool KABCore::syncPhone()
         abLocal.preparePhoneSync( mCurrentSyncDevice, true );
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( true );
                 abLocal.saveABphone( fileName );
                 abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                 //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 }
 void KABCore::getFile( bool success )
 {
     if ( ! success ) {
         message( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    mAddressBook->importFromFile( sentSyncFile() , false, true );
+    int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
+    if ( count )
+        setModified( true );
     message( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
     mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {
     mMessageTimer->stop();
     topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
 }
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index a2ff1e9..40089a1 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,35 +1,36 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
 #endif
 
+#include <qtextcodec.h> 
 #include <kstandarddirs.h>
 #include <qregexp.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 #include <libkdepim/kpimglobalprefs.h>
 
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv );
   QApplication::setStyle( new QPlatinumStyle ());
   QString hdir = QDir::homeDirPath();
   // there is a bug when creating dirs for WIN 98
   // it is difficult to fix, because we have no WIN 98 runnung
   // such that we try it to create the dirs at startup here
   if ( hdir == "C:\\" ) { // win 98 or ME
        QDir app_dir;
        if ( !app_dir.exists("C:\\kdepim") )
@@ -71,145 +72,24 @@ int main( int argc, char **argv )
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
        KAddressBookMain m ;
 //US      MainWindow m;
       QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 
       {
           KPimGlobalPrefs::instance()->setGlobalConfig();
       }
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m ); 
       
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
       a.exec();
 
 
   }
   qDebug("KA: Bye! ");
 }
 
-/*
-#include <stdlib.h>
-
-#include <qstring.h>
-
-#include <kabc/stdaddressbook.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kcrash.h>
-#include <kdebug.h>
-#include <klocale.h>
-#include <kstartupinfo.h>
-#include <kuniqueapplication.h>
-#include <kwin.h>
-
-#include "kaddressbookmain.h"
-#include "kabcore.h"
-
-extern "C" {
-
-void crashHandler( int )
-{
-  KABC::StdAddressBook::handleCrash();
-  ::exit( 0 );
-}
-
-}
-
-class KAddressBookApp : public KUniqueApplication {
-  public:
-    KAddressBookApp() : mMainWin( 0 ) {}
-    ~KAddressBookApp() {}
-
-    int newInstance();
-
-  private:
-    KAddressBookMain *mMainWin;
-};
-
-int KAddressBookApp::newInstance()
-{
-  if ( isRestored() ) {
-    // There can only be one main window
-    if ( KMainWindow::canBeRestored( 1 ) ) {
-      mMainWin = new KAddressBookMain;
-      mMainWin->show();
-      mMainWin->restore( 1 );
-    }
-  } else {
-    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-    QCString addrStr = args->getOption( "addr" );
-    QCString uidStr = args->getOption( "uid" );
-    QString addr;
-    QString uid;
-    if ( !addrStr.isEmpty() )
-      addr = QString::fromLocal8Bit( addrStr );
-    if ( !uidStr.isEmpty() )
-      uid = QString::fromLocal8Bit( uidStr );
-
-
-    if ( args->isSet( "editor-only" ) ) {
-      if ( !mMainWin )
-        mMainWin = new KAddressBookMain;
-        KStartupInfo::appStarted();
-        mMainWin->hide();
-    } else {
-      if ( mMainWin ) {
-        mMainWin->show();
-        KWin::setActiveWindow( mMainWin->winId() );
-      } else {
-        mMainWin = new KAddressBookMain;
-        mMainWin->show();
-      }
-    }
-    // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do
-    if ( !addr.isEmpty() )
-      mMainWin->addEmail( addr );
-
-    if ( !uid.isEmpty() )
-      mMainWin->showContactEditor( uid );
-    if ( args->isSet( "new-contact" ) ) {
-      mMainWin->newContact();
-    }
-  }
-
-  KCrash::setEmergencySaveFunction( crashHandler );
-
-  return 0;
-}
-
-// the dummy argument is required, because KMail apparently sends an empty
-// argument.
-static KCmdLineOptions kmoptions[] =
-{
-  { "a", 0 , 0 },
-  { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
-  { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 },
-  { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 },
-  { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
-  { "+[argument]", I18N_NOOP( "dummy argument" ), 0},
-  { 0, 0, 0}
-};
-
-int main( int argc, char *argv[] )
-{
-  KLocale::setMainCatalogue( "kaddressbook" );
-
-  KCmdLineArgs::init( argc, argv, KABCore::createAboutData() );
-  KCmdLineArgs::addCmdLineOptions( kmoptions );
-  KUniqueApplication::addCmdLineOptions();
-
-  if ( !KAddressBookApp::start() )
-    exit( 0 );
-
-  KAddressBookApp app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
-
-  return app.exec();
-}
-*/
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index c74f8cf..5fb4163 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -147,74 +147,76 @@ void DynamicTip::maybeTip( const QPoint &pos )
 
   tip( r, s );
     }
         else
         hide();
         ishidden = !ishidden;
       
 }
 
 ///////////////////////////
 // ContactListViewItem Methods
 
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
                                          ContactListView *parent,
                                          KABC::AddressBook *doc,
                                          const KABC::Field::List &fields )
   : KListViewItem(parent), mAddressee(a), mFields( fields ),
     parentListView( parent ), mDocument(doc)
 {
   refresh();
 }
 
 QString ContactListViewItem::key(int column, bool ascending) const
 {
+#ifndef DESKTOP_VERSION
     int lan = KGlobal::locale()->language();
     //qDebug("language %d ", lan);
     if ( lan == 1 ) { //GERMAN
         QString ret = QListViewItem::key(column, ascending).utf8();
         int start = -1;
         while ( (start = ret.find( 'ä', start+1)) > 0 ) {
             ret.at(start-1) = 'a';
         }
         start = -1;
         while ( (start = ret.find( 'ö', start+1)) > 0 ) {
             ret.at(start-1) = 'o';
         }
         start = -1;
         while ( (start = ret.find( 'ü', start+1)) > 0 ) {
             ret.at(start-1) = 'o';
         }
         start = -1;
         while ( (start = ret.find( 'ß', start+1)) > 0 ) {
             ret.at(start-1) = 's';
         }
         //qDebug("conv string %s ", ret.latin1());
 
         return ret;
         
     }
     else
+#endif
         return QListViewItem::key(column, ascending).lower();
 }
 
 void ContactListViewItem::paintCell(QPainter * p,
                                                     const QColorGroup & cg,
                                     int column,
                                     int width,
                                     int align)
 {
   KListViewItem::paintCell(p, cg, column, width, align);
 
   if ( !p )
     return;
 
   if (parentListView->singleLine()) {
     p->setPen( parentListView->alternateColor() );
     p->drawLine( 0, height() - 1, width, height() - 1 );
   }
 }
 
 
 ContactListView *ContactListViewItem::parent()
 {
   return parentListView;