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

List:       kde-commits
Subject:    extragear/graphics/kipi-plugins
From:       Jens Mueller <tschenser () gmx ! de>
Date:       2010-01-02 13:28:37
Message-ID: 1262438917.310702.17552.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1068998 by jmueller:

fix wrong deleting of m_urls variable
BUGS: 215846


 M  +2 -1      NEWS  
 M  +9 -19     picasawebexport/picasawebwindow.cpp  
 M  +1 -5      picasawebexport/picasawebwindow.h  


--- trunk/extragear/graphics/kipi-plugins/NEWS #1068997:1068998
@@ -12,4 +12,5 @@
 003 ==> AdvancedSlideShow : 215798 : Slideshow crashes when starting.
 004 ==> JPEGLossLess      : 200031 : Photo is rotated but not thumbnail.
 005 ==> PicasaWebExport   : 199145 : tags not exported to picasaweb [patch].
-006 ==> 
+006 ==> PicasaWebExport   : 215846 : PicasaWeb plugin crashes Digikam after start \
sending the pic [delete, \
KIPIPicasawebExportPlugin::PicasawebWindow::slotUploadImages] (double deletion) +007 \
                ==> 
--- trunk/extragear/graphics/kipi-plugins/picasawebexport/picasawebwindow.cpp \
#1068997:1068998 @@ -82,7 +82,6 @@
     m_uploadCount            = 0;
     m_uploadTotal            = 0;
 //  m_wallet                 = 0;
-    m_urls                   = 0;
     m_widget                 = new PicasawebWidget(this);
     m_photoView              = m_widget->m_photoView;
     m_newAlbumButton         = m_widget->m_newAlbumButton;
@@ -215,21 +214,13 @@
     m_talker->authenticate(token, username, password);
 }
 
-void PicasawebWindow::slotClose()
+void PicasawebWindow::closeEvent(QCloseEvent *e)
 {
-    kDebug() << "Writing token value as ########### " << m_talker->token() << " \
                #######" ;
-    saveSettings();
-    delete m_urls;
-    done(Close);
-}
-
-void PicasawebWindow::closeEvent(QCloseEvent *e) 
-{
     if (!e) return;
 
     kDebug() << "Writing token value as ########### " << m_talker->token() << " \
#######" ;  saveSettings();
-    delete m_urls;
+    m_urls.clear();
     e->accept();
 }
 
@@ -266,7 +257,7 @@
 
 PicasawebWindow::~PicasawebWindow()
 {
-    delete m_urls;
+    m_urls.clear();
     delete m_progressDlg;
     delete m_authProgressDlg;
     delete m_talker;
@@ -418,8 +409,8 @@
 {
     //m_talker->listPhotoSets();
     KIPIPlugins::ImageDialog dlg(this, m_interface);
-    delete m_urls;
-    m_urls = new KUrl::List( dlg.urls() );
+    m_urls.clear();
+    m_urls = dlg.urls();
 }
 
 void PicasawebWindow::slotUploadImages()
@@ -433,12 +424,11 @@
 
     if (m_widget->m_currentSelectionButton->isChecked())
     {
-        delete m_urls;
-
-        m_urls = new KUrl::List(m_interface->currentSelection().images());
+        m_urls.clear();
+        m_urls = m_interface->currentSelection().images();
     }
 
-    if (m_urls == NULL || m_urls->isEmpty()) 
+    if (m_urls.isEmpty())
     {
         KMessageBox::error(this, i18n("Nothing to upload - please select photos to \
upload."));  return;
@@ -448,7 +438,7 @@
 
     m_uploadQueue.clear();
 
-    for (KUrl::List::ConstIterator it = m_urls->constBegin(); it != \
m_urls->constEnd(); ++it) +    for (KUrl::List::ConstIterator it = \
m_urls.constBegin(); it != m_urls.constEnd(); ++it)  {
         KIPI::ImageInfo info = m_interface->info( *it );
         FPhotoInfo temp;
--- trunk/extragear/graphics/kipi-plugins/picasawebexport/picasawebwindow.h \
#1068997:1068998 @@ -113,10 +113,6 @@
     void slotRefreshSizeButtons(bool);
 //  void slotHandleLogin();
 
-protected:
-
-    void slotClose();
-
 private:
 
     unsigned int                             m_uploadCount;
@@ -153,7 +149,7 @@
 //  KWallet::Wallet                         *m_wallet;
 
     KHTMLPart                               *m_photoView;
-    KUrl::List                              *m_urls;
+    KUrl::List                               m_urls;
 
     QString                                  m_currentAlbumId;
 


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