fixes

3 files changed, 13 insertions, 8 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e34951a..ce5c755 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2518,4 +2518,7 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
   bool ok = false;
   mEmailSourceChannel = sourceChannel;
+  mEmailSourceUID = uid; 
+  callContactdialog();
+#if 0
   int wid = uid.toInt( &ok );
   qDebug("UID %s ", uid.latin1());
@@ -2539,5 +2542,5 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
   callContactdialog();
   //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
-
+#endif
 }
 void KABCore::resizeAndCallContactdialog()
@@ -2552,5 +2555,5 @@ void KABCore::callContactdialog()
   QStringList emailList;
   QStringList uidList; 
-  qDebug("WIDTH %d ",   QApplication::desktop()->width()       );
+  qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ",   QApplication::desktop()->width()       );
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
   uint i=0;
@@ -2561,5 +2564,5 @@ void KABCore::callContactdialog()
         uidList.append(list[i].uid());
   }
-  QString uid = "unnamed";
+  QString uid = mEmailSourceUID;
   //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d89daee..4cef73a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -391,4 +391,5 @@ class KABCore : public QWidget, public KSyncInterface
   private:
     QString mEmailSourceChannel;
+    QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e7bc8c0..0127fc0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -243,6 +243,6 @@ void XXPortSelectDialog::initGUI()
   QFrame *page = plainPage();
 
-  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(),
-                                            KDialog::spacingHint() );
+  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
 
   QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
@@ -278,4 +278,5 @@ void XXPortSelectDialog::initGUI()
 
   mFiltersCombo = new QComboBox( false, mButtonGroup );
+  mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
   QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
   groupLayout->addWidget( mFiltersCombo, 2, 1 );
@@ -286,7 +287,7 @@ void XXPortSelectDialog::initGUI()
   QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
   groupLayout->addWidget( mCategoriesView, 3, 1 );
-
-  if (QApplication::desktop()->height() == 480 )
-     mCategoriesView->setMaximumHeight( 240 );
+  mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  //if (QApplication::desktop()->height() == 480 )
+  // mCategoriesView->setMaximumHeight( 240 );
   topLayout->addWidget( mButtonGroup );