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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim
From:       Pradeepto Bhattacharya <pradeepto () kde ! org>
Date:       2008-02-28 5:38:22
Message-ID: 1204177102.525415.29963.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780151 by pradeepto:

Merged revisions 768903 via svnmerge from 
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r768903 | osterfeld | 2008-01-31 03:20:33 +0530 (Thu, 31 Jan 2008) | 1 line
  
  do it right
........


 _M            . (directory)  
 M  +1 -1      kaddressbook/kabcore.cpp  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-768902,768904-768928,768930-769032,769034,769036-769040,769043-769044,7690 \
46,769048-769050,769052-769057,769059-769139,769142-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-768928,768930-769032,769034,769036-769040,769043-769044,769046,769048-76905 \
0,769052-769057,769059-769139,769142-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
                
--- branches/KDE/3.5/kdepim/kaddressbook/kabcore.cpp #780150:780151
@@ -1544,7 +1544,7 @@
     return;
   QGuardedPtr<KPIM::DistributionListEditor::EditorWidget> dlg = new \
KPIM::DistributionListEditor::EditorWidget( addressBook(), widget() );  \
                dlg->setDistributionList( dist );
-  if ( dlg->exec() == QDialog::Accepted ) {
+  if ( dlg->exec() == QDialog::Accepted && dlg ) {
     const KPIM::DistributionList newDist = dlg->distributionList();
     if ( newDist != dist ) {
       addressBook()->insertAddressee( newDist );


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