[Kde-imaging] kdeextragear-libs-1/kipi-plugins

[Gilles Caulier]

CVS commit by cgilles: 

Fixed m_progressDlg->setButtonCancel( KStdGuiItem::close() ) in CDArchiving an ImageGallery plugins.
CCMAIL: kde-imaging at kde.org


  M +5 -0      cdarchiving/plugin_cdarchiving.cpp   1.21
  M +5 -2      imagesgallery/plugin_imagesgallery.cpp   1.17


--- kdeextragear-libs-1/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp  #1.20:1.21
@@ -305,5 +305,10 @@ void Plugin_CDArchiving::customEvent(QCu
            {
            m_current = 0;
+
+#if KDE_VERSION >= 0x30200
            m_progressDlg->setButtonCancel( KStdGuiItem::close() );
+#else
+           m_progressDlg->setButtonCancelText( i18n("&Close") );
+#endif
                    
            disconnect(m_progressDlg, SIGNAL(cancelClicked()),

--- kdeextragear-libs-1/kipi-plugins/imagesgallery/plugin_imagesgallery.cpp  #1.16:1.17
@@ -282,10 +282,13 @@ void Plugin_Imagesgallery::customEvent(Q
         m_progressDlg->setProgress(m_current, m_total);
 
-           // TODO
-                
         if( d->action == KIPIImagesGalleryPlugin::BuildHTMLiface )
            {
            m_current = 0;
+
+#if KDE_VERSION >= 0x30200
            m_progressDlg->setButtonCancel( KStdGuiItem::close() );
+#else
+           m_progressDlg->setButtonCancelText( i18n("&Close") );
+#endif
                    
            disconnect(m_progressDlg, SIGNAL(cancelClicked()),