1 files changed, 16 insertions, 8 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 0276231..8937227 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -449,292 +449,300 @@ void AddressbookWindow::slotListDelete()
 		
 		if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
 						   strName ) ) {
 			m_abView->removeEntry( tmpEntry.uid() );
 		}
 	} else {
 		QMessageBox::warning( this, tr("Contacts"),
 				      tr("Can not edit data, currently syncing") );
 	}
 }
 
 void AddressbookWindow::slotFindOpen()
 {
 	searchBar->show();
 	m_abView -> inSearch();
 	searchEdit->setFocus();
 }
 void AddressbookWindow::slotFindClose()
 {
 	searchBar->hide();
 	m_abView -> offSearch();
 	// m_abView->setFocus();
 }
 
 
 void AddressbookWindow::slotFind()
 {
 	m_abView->slotDoFind( searchEdit->text(), m_config.beCaseSensitive(), m_config.useRegExp(), false);
 	
 	searchEdit->clearFocus();
 	// m_abView->setFocus();
 	
 }
 
 void AddressbookWindow::slotViewBack()
 {
 	// :SX showList();
 }
 
 void AddressbookWindow::slotViewEdit()
 {
 	if(!syncing) {
 		if (actionPersonal->isOn()) {
 			editPersonal();
 		} else {
 			editEntry( EditEntry );
 		}
 	} else {
 		QMessageBox::warning( this, tr("Contacts"),
 				      tr("Can not edit data, currently syncing") );
 	}
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
 	OContact c = m_abView -> 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_config.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_config.setUseOpieMail( true );
 	}
 	if ( m_config.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_config.setUseQtMail( true );
 	}
 
 }
 
 static const char * beamfile = "/tmp/obex/contact.vcf";
 
 void AddressbookWindow::slotBeam()
 {
-	QString filename;
+	QString beamFilename;
 	OContact c;
 	if ( actionPersonal->isOn() ) {
-		filename = addressbookPersonalVCardName();
-		if (!QFile::exists(filename))
+		beamFilename = addressbookPersonalVCardName();
+		if ( !QFile::exists( beamFilename ) )
 			return; // can't beam a non-existent file
 		OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
-											filename );
+											beamFilename );
 		OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		OContactAccess::List allList = access->allRecords();
 		OContactAccess::List::Iterator it = allList.begin();  // Just take first
 		c = *it;
 
 		delete access;
 	} else {
 		unlink( beamfile ); // delete if exists
 		mkdir("/tmp/obex/", 0755);
 		c = m_abView -> currentEntry();
 		OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
 											beamfile );
 		OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		access->add( c );
 		access->save();
 		delete access;
 
-		filename = beamfile;
+		beamFilename = beamfile;
 	}
 
+	qWarning("Beaming: %s", beamFilename.latin1() );
 
 	Ir *ir = new Ir( this );
 	connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
 	QString description = c.fullName();
-	ir->send( filename, description, "text/x-vCard" );
+	ir->send( beamFilename, description, "text/x-vCard" );
 }
 
 void AddressbookWindow::beamDone( Ir *ir )
 {
+
 	delete ir;
 	unlink( beamfile );
 }
 
 
 static void parseName( const QString& name, QString *first, QString *middle,
 		       QString * last )
 {
 	
 	int comma = name.find ( "," );
 	QString rest;
 	if ( comma > 0 ) {
 		*last = name.left( comma );
 		comma++;
 		while ( comma < int(name.length()) && name[comma] == ' ' )
 			comma++;
 		rest = name.mid( comma );
 	} else {
 		int space = name.findRev( ' ' );
 		*last = name.mid( space+1 );
 		rest = name.left( space );
 	}
 	int space = rest.find( ' ' );
 	if ( space <= 0 ) {
 		*first = rest;
 	} else {
 		*first = rest.left( space );
 		*middle = rest.mid( space+1 );
 	}
 	
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
 	if (msg == "editPersonal()") {
 		editPersonal();
 	} else if (msg == "editPersonalAndClose()") {
 		editPersonal();
 		close();
 	} else if ( msg == "addContact(QString,QString)" ) {
 		QDataStream stream(data,IO_ReadOnly);
 		QString name, email;
 		stream >> name >> email;
 		
 		OContact cnt;
 		QString fn, mn, ln;
 		parseName( name, &fn, &mn, &ln );
 		//  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
 		cnt.setFirstName( fn );
 		cnt.setMiddleName( mn );
 		cnt.setLastName( ln );
 		cnt.insertEmails( email );
 		cnt.setDefaultEmail( email );
 		cnt.setFileAs();
 		
 		m_abView -> addEntry( cnt );
 		
 		// :SXm_abView()->init( cnt );
 		editEntry( EditEntry );
+	} else if ( msg == "beamBusinessCard()" ) {
+		QString beamFilename = addressbookPersonalVCardName();
+		if ( !QFile::exists( beamFilename ) )
+			return; // can't beam a non-existent file
 		
-		
-		
+		Ir *ir = new Ir( this );
+		connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
+		QString description = "mycard.vcf";
+		ir->send( beamFilename, description, "text/x-vCard" );
 	}
 #if 0
 	else if (msg == "pickAddresses(QCString,QCString,QStringList,...)" ) {
 		QDataStream stream(data,IO_ReadOnly);
 		QCString ch,m;
 		QStringList types;
 		stream >> ch >> m >> types;
 		AddressPicker picker(abList,this,0,TRUE);
 		picker.showMaximized();
 		picker.setChoiceNames(types);
 		int i=0;
 		for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
 			QStringList sel;
 			stream >> sel;
 			picker.setSelection(i++,sel);
 		}
 		picker.showMaximized();
 		picker.exec();
 		
 		// ###### note: contacts may have been added - save here!
 		
 		setCentralWidget(abList);
 		QCopEnvelope e(ch,m);
 		i=0;
 		for (QStringList::ConstIterator it = types.begin(); it!=types.end(); ++it) {
 			QStringList sel = picker.selection(i++);
 			e << sel;
 		}
 	}
 #endif
 	
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
 	OContact entry;
 	if ( !abEditor ) {
 		abEditor = new ContactEditor( entry, this, "editor" );
 	}
 	if ( entryMode == EditEntry )
 		abEditor->setEntry( m_abView -> currentEntry() );
 	else if ( entryMode == NewEntry )
 		abEditor->setEntry( entry );
 	// other things may change the caption.
 	abEditor->setCaption( tr("Edit Address") );
 	
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	abEditor->showMaximized();
 #endif
 	// fix the foxus...
 	abEditor->setNameFocus();
 	if ( abEditor->exec() ) {
 		setFocus();
 		if ( entryMode == NewEntry ) {
 			OContact insertEntry = abEditor->entry();
 			insertEntry.assignUid();
 			m_abView -> addEntry( insertEntry );
 		} else {
 			OContact replEntry = abEditor->entry();
 
 			if ( !replEntry.isValidUid() )
 				replEntry.assignUid();
 
 			m_abView -> replaceEntry( replEntry );
 		}
 	}
 	// populateCategories();
 
 }
 
 void AddressbookWindow::editPersonal()
 {
 	OContact entry;
 
 	// Switch to personal view if not selected
 	// but take care of the menu, too
 	if ( ! actionPersonal->isOn() ){
 		qWarning("*** ++++");
 		actionPersonal->setOn( true );
 		slotPersonalView();
 	}
 
 	if ( !abEditor ) {
 		abEditor = new ContactEditor( entry, this, "editor" );
 	}
 
  	abEditor->setCaption(tr("Edit My Personal Details"));
  	abEditor->setPersonalView( true );
 	editEntry( EditEntry );
  	abEditor->setPersonalView( false );
 
 }
 
 
 void AddressbookWindow::slotPersonalView()
 {