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

List:       kde-commits
Subject:    kdepim/libkdepim
From:       David Faure <faure () kde ! org>
Date:       2004-11-29 10:08:52
Message-ID: 20041129100852.450141B5B4 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Don't reconnect to loadContacts() from within loadContacts() itself.
This messes up the QObject connection list and can end up looping infinitely!


  M +5 -4      addresseelineedit.cpp   1.34
  M +1 -0      addresseelineedit.h   1.18


--- kdepim/libkdepim/addresseelineedit.cpp  #1.33:1.34
@@ -85,4 +85,5 @@ AddresseeLineEdit::AddresseeLineEdit( QW
   m_completionInitialized = false;
   m_smartPaste = false;
+  m_addressBookConnected = false;
 
   init();
@@ -485,8 +486,8 @@ void AddresseeLineEdit::loadContacts()
   QApplication::restoreOverrideCursor();
 
-  disconnect( addressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
-              this, SLOT( loadContacts() ) );
-
+  if ( !m_addressBookConnected ) {
   connect( addressBook, SIGNAL( addressBookChanged( AddressBook* ) ), SLOT( loadContacts() ) );
+    m_addressBookConnected = true;
+  }
 }
 

--- kdepim/libkdepim/addresseelineedit.h  #1.17:1.18
@@ -110,4 +110,5 @@ class AddresseeLineEdit : public ClickLi
     bool m_completionInitialized;
     bool m_smartPaste;
+    bool m_addressBookConnected;
 
     //QMap<QString, KABC::Addressee> m_contactMap;


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