1 files changed, 42 insertions, 1 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 3466801..39d8321 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -71,35 +71,41 @@ static QString addressbookPersonalVCardName()
                                                        "businesscard.vcf");
         return filename;
 }
 
 
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
                                       WFlags f )
         : QMainWindow( parent, name, f ),
           abEditor(0),
           useRegExp(false),
           doNotifyWrapAround(true),
           caseSensitive(false),
+          m_useQtMail(true),
+          m_useOpieMail(false),
           bAbEditFirstTime(TRUE),
           syncing(FALSE)
 {
         isLoading = true;
 
         // Read Config settings
         Config cfg("AddressBook");
         cfg.setGroup("Search");
         useRegExp = cfg.readBoolEntry( "useRegExp" );
         caseSensitive = cfg.readBoolEntry( "caseSensitive" );
         doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" );
+        cfg.setGroup("Mail");
+        m_useQtMail = cfg.readBoolEntry( "useQtMail" );
+        m_useOpieMail=cfg.readBoolEntry( "useOpieMail" );
+        
 
         initFields();
         
         setCaption( tr("Contacts") );
         setIcon( Resource::loadPixmap( "AddressBook" ) );
         
         setToolBarsMovable( FALSE );
         
         // Create Toolbars
         
         QPEToolBar *bar = new QPEToolBar( this );
         bar->setHorizontalStretchable( TRUE );
@@ -160,25 +166,25 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         searchBar->setStretchableWidget( searchEdit );
         connect( searchEdit, SIGNAL( returnPressed( ) ),
                  this, SLOT( slotFind( ) ) );
 
         a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ), this, SLOT( slotFindNext() ) );
         a->addTo( searchBar );
 
         a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) );
         a->addTo( searchBar );
 
-        a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
+        a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "mail/sendmail" ),
                          QString::null, 0, this, 0 );
         //a->setEnabled( FALSE ); we got support for it now :) zecke
         actionMail = a;
         connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
         a->addTo( edit );
         a->addTo( listTools );
         
         
         
         if ( Ir::supported() ) {
                 a = new QAction( tr ("Beam Entry" ), Resource::loadPixmap( "beam" ), QString::null,
                                  0, this, 0 );
@@ -273,30 +279,34 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         abList->setCurrentCell( 0, 0 );
         
         isLoading = false;
 }
 
 
 void AddressbookWindow::slotConfig()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setUseRegExp ( useRegExp );
         dlg -> setBeCaseSensitive( caseSensitive );
         dlg -> setSignalWrapAround( doNotifyWrapAround );
+        dlg -> setQtMail ( m_useQtMail );
+        dlg -> setOpieMail ( m_useOpieMail );
         dlg -> showMaximized();
         if ( dlg -> exec() ) {
                 qWarning ("Config Dialog accepted !");
                 useRegExp = dlg -> useRegExp();
                 caseSensitive = dlg -> beCaseSensitive();
                 doNotifyWrapAround = dlg -> signalWrapAround();
+                m_useQtMail = dlg -> useQtMail();
+                m_useOpieMail= dlg -> useOpieMail();
         }
 
         delete dlg;
 }
 
 
 void AddressbookWindow::slotSetFont( int size ) {
         
         if (size > 2 || size < 0)
                 size = 1;
         
         startFontSize = size;
@@ -371,24 +381,27 @@ void AddressbookWindow::resizeEvent( QResizeEvent *e )
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
         Config cfg("AddressBook");
         cfg.setGroup("Font");
         cfg.writeEntry("fontSize", startFontSize);
 
         cfg.setGroup("Search");
         cfg.writeEntry("useRegExp", useRegExp);
         cfg.writeEntry("caseSensitive", caseSensitive);
         cfg.writeEntry("doNotifyWrapAround", doNotifyWrapAround);
+        cfg.setGroup("Mail");
+        cfg.writeEntry( "useQtMail", m_useQtMail );
+        cfg.writeEntry( "useOpieMail", m_useOpieMail);
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
         OContact ce = abList->currentEntry();
         actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::showList()
 {
         bool visiblemView;
         
@@ -485,26 +498,54 @@ void AddressbookWindow::slotViewEdit()
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
         OContact c = abList->currentEntry();
         QString name = c.fileAs();
         QString email = c.defaultEmail();
+
+        // I prefer the OPIE-Environment variable before the 
+        // QPE-one..
+        QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
+        if ( basepath.isEmpty() )
+                basepath = QString::fromLatin1( getenv("QPEDIR") );
+
+        // Try to access the preferred. If not possible, try to 
+        // switch to the other one.. 
+        if ( m_useQtMail ){
+                qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
+                if ( QFile::exists( basepath + "/bin/qtmail" ) ){
+                        qWarning ("QCop");
         QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
         e << name << email;
+                        return;
+                } else
+                        m_useOpieMail = true;
+        }
+        if ( m_useOpieMail ){
+                qWarning ("Accessing: %s", (basepath + "/bin/mail").latin1());
+                if ( QFile::exists( basepath + "/bin/mail" ) ){
+                        qWarning ("QCop");
+                        QCopEnvelope e("QPE/Application/mail", "writeMail(QString,QString)");
+                        e << name << email;
+                        return;
+                } else
+                        m_useQtMail = true;
+        }
+
 }
 
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
 void AddressbookWindow::slotBeam()
 {
         QString filename;
         OContact c;
         if ( actionPersonal->isOn() ) {
                 filename = addressbookPersonalVCardName();
                 if (!QFile::exists(filename))
                         return; // can't beam a non-existent file