1 files changed, 12 insertions, 7 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index f125edb..cc3908a 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -71,6 +71,6 @@ ContactEditor::ContactEditor(	const OContact &entry,
 	init();
 	setEntry( entry );
-
 	cmbDefaultEmail = 0;
+	defaultEmailChooserPosition = -1;
 }
 
@@ -632,6 +632,7 @@ void ContactEditor::defaultEmailChanged(int i){
 }
 
-void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) {
+void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
 
+	qDebug("defaultEmailChooserPosition %i, widgetPos %i ",defaultEmailChooserPosition,widgetPos);
         if (slChooserNames[index] == "Default Email"){         
 	  if (cmbDefaultEmail) delete cmbDefaultEmail;
@@ -647,5 +648,9 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineE
 
 	  cmbDefaultEmail->show();
-        }
+	  defaultEmailChooserPosition = widgetPos;
+        }else if (defaultEmailChooserPosition == widgetPos){
+	qDebug("cmbDefaultEmail->hide()");
+	  if (cmbDefaultEmail) cmbDefaultEmail->hide();
+	}
 
 
@@ -655,18 +660,18 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QLineE
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1);
+	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2);
+	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3);
+	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4);
+	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }