[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/groupwise/ui
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2008-11-28 11:06:21
Message-ID: 1227870381.524957.21787.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890028 by wstephens:

Make input validation connection; fix race condition when Oking before search completed causing a crash

 M  +8 -9      gwaddcontactpage.cpp  
 M  +2 -0      gwaddcontactpage.h  


--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp #890027:890028
@@ -58,8 +58,9 @@
 	{
 		m_searchUI = new GroupWiseContactSearch( m_account, QAbstractItemView::SingleSelection, false,
 				 this );
+		connect(m_searchUI, SIGNAL(selectionValidates(bool)),SLOT(searchResult(bool)));
 		layout->addWidget( m_searchUI );
-		m_canadd = true;
+		m_canadd = false;
 	}
 	else
 	{
@@ -104,14 +105,12 @@
 
 bool GroupWiseAddContactPage::validateData()
 {
-	if ( m_canadd )
-#ifdef __GNUC__
-#warning FIXME port GroupWiseAddContactPage::validateData to interview based GroupWiseSearch
-#endif
-		return true;
-	//return ( m_searchUI->m_results->selectedItem() );
-	else
-		return false;
+	return m_canadd;
 }
 
+void GroupWiseAddContactPage::searchResult(bool valid)
+{
+	m_canadd = valid;
+}
+
 #include "gwaddcontactpage.moc"
--- trunk/KDE/kdenetwork/kopete/protocols/groupwise/ui/gwaddcontactpage.h #890027:890028
@@ -57,6 +57,8 @@
 	 * Is the data correct?
 	 */
     virtual bool validateData();
+private slots:
+	void searchResult(bool valid);
 protected:
 	Q3ValueList< GroupWise::ContactDetails > m_searchResults;
 	unsigned char searchOperation( int comboIndex );
[prev in list] [next in list] [prev in thread] [next in thread]