packages: kde4-kdepim/kde4-kdepim-branch.diff, kde4-kdepim/kde4-kdepim.spec...

arekm arekm at pld-linux.org
Fri Jun 26 12:04:12 CEST 2009 

Author: arekm                        Date: Fri Jun 26 10:04:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gpgme 1.2.0 fixes

---- Files affected:
packages/kde4-kdepim:
   kde4-kdepim-branch.diff (1.10 -> 1.11) , kde4-kdepim.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: packages/kde4-kdepim/kde4-kdepim-branch.diff
diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.10 packages/kde4-kdepim/kde4-kdepim-branch.diff:1.11
--- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.10	Thu May 28 21:38:52 2009
+++ packages/kde4-kdepim/kde4-kdepim-branch.diff	Fri Jun 26 12:04:07 2009
@@ -1,7 +1,20 @@
+Index: akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop
+===================================================================
+--- akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
+@@ -19,7 +19,7 @@
+ Name[ga]=Inneall stórála Metakit
+ Name[gl]=Manexador do almacenador Metakit
+ Name[hu]=Metakit tároló
+-Name[is]=Metakit geymslu bakendi
++Name[is]=Metakit geymslubakendi
+ Name[it]=Backend archiviazione metakit
+ Name[ja]=Metakit ストレージバックエンド
+ Name[ka]=Metakit  მეხსიერების ბუფერი
 Index: akregator/plugins/mk4storage/feedstoragemk4impl.cpp
 ===================================================================
---- akregator/plugins/mk4storage/feedstoragemk4impl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/plugins/mk4storage/feedstoragemk4impl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/plugins/mk4storage/feedstoragemk4impl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/plugins/mk4storage/feedstoragemk4impl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -95,10 +95,6 @@
          StorageMK4Impl* mainStorage;
          c4_View archiveView;
@@ -186,8 +199,8 @@
  }
 Index: akregator/plugins/CMakeLists.txt
 ===================================================================
---- akregator/plugins/CMakeLists.txt	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/plugins/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/plugins/CMakeLists.txt	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/plugins/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -1,3 +1,8 @@
  add_subdirectory( mk4storage )
 +
@@ -199,8 +212,8 @@
  
 Index: akregator/src/articleviewer.cpp
 ===================================================================
---- akregator/src/articleviewer.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/articleviewer.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/articleviewer.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/articleviewer.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -304,7 +304,9 @@
      QClipboard *cb = QApplication::clipboard();
      cb->setText(m_url.prettyUrl(), QClipboard::Clipboard);
@@ -226,8 +239,8 @@
              KConfigGroup conf(Settings::self()->config(), "General");
 Index: akregator/src/selectioncontroller.cpp
 ===================================================================
---- akregator/src/selectioncontroller.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/selectioncontroller.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/selectioncontroller.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/selectioncontroller.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -181,7 +181,7 @@
  
  void Akregator::SelectionController::articleHeadersAvailable()
@@ -239,8 +252,8 @@
      delete m_articleModel;
 Index: akregator/src/feed.cpp
 ===================================================================
---- akregator/src/feed.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/feed.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/feed.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/feed.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -668,7 +668,7 @@
      }
  
@@ -252,8 +265,8 @@
      d->htmlUrl = doc->link();
 Index: akregator/src/aboutdata.h
 ===================================================================
---- akregator/src/aboutdata.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/aboutdata.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/aboutdata.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/aboutdata.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -28,7 +28,7 @@
  #include "akregator_export.h"
  #include <kaboutdata.h>
@@ -265,8 +278,8 @@
  /**
 Index: akregator/src/articlelistview.cpp
 ===================================================================
---- akregator/src/articlelistview.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/articlelistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/articlelistview.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/articlelistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -428,7 +428,7 @@
  {
      if ( !model() )
@@ -286,8 +299,8 @@
      const QModelIndex newIdx = model()->index( qMin( newRow, model()->rowCount() - 1 ), 0 );
 Index: akregator/src/mainwindow.cpp
 ===================================================================
---- akregator/src/mainwindow.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/mainwindow.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/mainwindow.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/mainwindow.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -152,7 +152,7 @@
  void MainWindow::optionsConfigureKeys()
  {
@@ -299,8 +312,8 @@
      if (m_part)
 Index: akregator/src/subscriptionlistview.h
 ===================================================================
---- akregator/src/subscriptionlistview.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/subscriptionlistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/subscriptionlistview.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/subscriptionlistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -73,6 +73,9 @@
      void slotItemRight();
      void slotItemUp();
@@ -313,8 +326,8 @@
      void saveHeaderSettings();
 Index: akregator/src/actionmanagerimpl.cpp
 ===================================================================
---- akregator/src/actionmanagerimpl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/actionmanagerimpl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/actionmanagerimpl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/actionmanagerimpl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -313,14 +313,16 @@
      connect(action, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotCopyLinkAddress()));
  
@@ -349,8 +362,8 @@
      action->setShortcut( QKeySequence(Qt::ALT+Qt::Key_Minus) );
 Index: akregator/src/tabwidget.cpp
 ===================================================================
---- akregator/src/tabwidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/tabwidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/tabwidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/tabwidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -213,6 +213,7 @@
      Frame* f = d->framesById.value(frameId);
      d->frames.remove(f);
@@ -361,8 +374,8 @@
      if (d->currentFrame())
 Index: akregator/src/subscriptionlistview.cpp
 ===================================================================
---- akregator/src/subscriptionlistview.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/subscriptionlistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/subscriptionlistview.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/subscriptionlistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -237,6 +237,7 @@
  {
      if ( !model() )
@@ -389,8 +402,8 @@
      if ( !next.isValid() )
 Index: akregator/src/articlelistview.h
 ===================================================================
---- akregator/src/articlelistview.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/articlelistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/articlelistview.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/articlelistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -139,6 +139,10 @@
  
      void slotNextUnreadArticle();
@@ -404,8 +417,8 @@
      void loadHeaderSettings();
 Index: akregator/src/mainwidget.cpp
 ===================================================================
---- akregator/src/mainwidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/mainwidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/mainwidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/mainwidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -134,9 +134,10 @@
      m_feedListView->setObjectName( "feedtree" );
      m_actionManager->initSubscriptionListView( m_feedListView );
@@ -458,8 +471,8 @@
          m_feedListView->slotPrevUnreadFeed();
 Index: akregator/src/trayicon.cpp
 ===================================================================
---- akregator/src/trayicon.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/trayicon.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/trayicon.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/trayicon.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -152,7 +152,7 @@
          }
  
@@ -480,8 +493,8 @@
  
 Index: akregator/src/mainwidget.h
 ===================================================================
---- akregator/src/mainwidget.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/src/mainwidget.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/src/mainwidget.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/src/mainwidget.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -138,8 +138,7 @@
          /** the article selection has changed */
          void slotArticleSelected(const Akregator::Article&);
@@ -494,8 +507,8 @@
          void slotSetTotalUnread();
 Index: akregator/configuration/akregator_config_browser.desktop
 ===================================================================
---- akregator/configuration/akregator_config_browser.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/akregator_config_browser.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/akregator_config_browser.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/akregator_config_browser.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -26,6 +26,7 @@
  Name[ko]=탐색기
  Name[lt]=Naršyklė
@@ -506,8 +519,8 @@
  Name[nn]=Nettlesar
 Index: akregator/configuration/akregator_config_appearance.desktop
 ===================================================================
---- akregator/configuration/akregator_config_appearance.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/akregator_config_appearance.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/akregator_config_appearance.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/akregator_config_appearance.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -42,6 +42,7 @@
  Name[ko]=모양
  Name[lt]=Išvaizda
@@ -518,8 +531,8 @@
  Name[nb]=Utseende
 Index: akregator/configuration/akregator_config_advanced.desktop
 ===================================================================
---- akregator/configuration/akregator_config_advanced.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/akregator_config_advanced.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/akregator_config_advanced.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/akregator_config_advanced.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -29,6 +29,7 @@
  Name[ko]=고급
  Name[lt]=Sudėtingesni
@@ -530,8 +543,8 @@
  Name[nl]=Geavanceerd
 Index: akregator/configuration/settings_advanced.cpp
 ===================================================================
---- akregator/configuration/settings_advanced.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/settings_advanced.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/settings_advanced.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/settings_advanced.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -27,11 +27,13 @@
  #include "storagefactory.h"
  #include "storagefactoryregistry.h"
@@ -631,8 +644,8 @@
  } //namespace Akregator
 Index: akregator/configuration/akregator_config_general.desktop
 ===================================================================
---- akregator/configuration/akregator_config_general.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/akregator_config_general.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/akregator_config_general.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/akregator_config_general.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -40,6 +40,7 @@
  Name[ko]=일반
  Name[lt]=Bendras
@@ -643,8 +656,8 @@
  Name[nb]=SGenerelt
 Index: akregator/configuration/settings_advanced.h
 ===================================================================
---- akregator/configuration/settings_advanced.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/settings_advanced.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- akregator/configuration/settings_advanced.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/settings_advanced.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -57,8 +57,7 @@
          void slotFactorySelected(int);
          
@@ -657,9 +670,16 @@
  } // namespace Akregator
 Index: akregator/configuration/akregator_config_archive.desktop
 ===================================================================
---- akregator/configuration/akregator_config_archive.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ akregator/configuration/akregator_config_archive.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
-@@ -27,6 +27,7 @@
+--- akregator/configuration/akregator_config_archive.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ akregator/configuration/akregator_config_archive.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
+@@ -21,12 +21,14 @@
+ Name[ga]=Cartlann
+ Name[gl]=Arquivo
+ Name[hu]=Archívum
++Name[is]=Safnskrá
+ Name[it]=Archivia
+ Name[ja]=アーカイブ
+ Name[km]=ប័ណ្ណសារ
  Name[ko]=저장소
  Name[lt]=Archyvas
  Name[lv]=Arhīvs
@@ -667,10 +687,31 @@
  Name[nb]=Arkiv
  Name[nds]=Archiev
  Name[nl]=Archief
+@@ -56,6 +58,7 @@
+ Comment[ga]=Cumraigh Cartlann na bhFothaí
+ Comment[gl]=Configurar o Arquivo de Fontes de Novas
+ Comment[hu]=A hírolvasó-archívum beállításai
++Comment[is]=Stilla fréttastraumaskrá
+ Comment[it]=Configura l'archiviazione delle fonti
+ Comment[ja]=フィードのアーカイブ設定
+ Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ប័ណ្ណសារ​មតិព័ត៌មាន
+Index: libkleo/backends/qgpgme/qgpgmebackend.cpp
+===================================================================
+--- libkleo/backends/qgpgme/qgpgmebackend.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ libkleo/backends/qgpgme/qgpgmebackend.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
+@@ -280,7 +280,7 @@
+     mOpenPGPProtocol( 0 ),
+     mSMIMEProtocol( 0 )
+ {
+-
++  GpgME::initializeLibrary();
+ }
+ 
+ Kleo::QGpgMEBackend::~QGpgMEBackend() {
 Index: libkleo/backends/qgpgme/threadedjobmixin.h
 ===================================================================
---- libkleo/backends/qgpgme/threadedjobmixin.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ libkleo/backends/qgpgme/threadedjobmixin.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- libkleo/backends/qgpgme/threadedjobmixin.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ libkleo/backends/qgpgme/threadedjobmixin.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -45,6 +45,7 @@
  #include <gpgme++/context.h>
  #include <gpgme++/interfaces/progressprovider.h>
@@ -702,8 +743,8 @@
    };
 Index: kleopatra/conf/kleopatra_config_appear.desktop
 ===================================================================
---- kleopatra/conf/kleopatra_config_appear.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kleopatra/conf/kleopatra_config_appear.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kleopatra/conf/kleopatra_config_appear.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kleopatra/conf/kleopatra_config_appear.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -44,6 +44,7 @@
  Name[ko]=모양
  Name[lt]=Išvaizda
@@ -712,10 +753,32 @@
  Name[mk]=Изглед
  Name[ms]=Rupa
  Name[nb]=Utseende
+Index: kleopatra/main.cpp
+===================================================================
+--- kleopatra/main.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kleopatra/main.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
+@@ -75,6 +75,8 @@
+ #include <QEventLoop>
+ #include <QThreadPool>
+ 
++#include <gpgme++/global.h>
++
+ #include <boost/shared_ptr.hpp>
+ 
+ #include <cassert>
+@@ -153,6 +155,8 @@
+     QTime timer;
+     timer.start();
+ 
++    GpgME::initializeLibrary();
++
+   {
+       const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
+       QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
 Index: kresources/tvanytime/kcal_tvanytime.desktop
 ===================================================================
---- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/tvanytime/kcal_tvanytime.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/tvanytime/kcal_tvanytime.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -26,6 +26,7 @@
  Name[ko]=TV 편성표
  Name[lt]=TV tvarkaraščiai
@@ -726,8 +789,8 @@
  Name[nds]=Feernsehprogramm
 Index: kresources/kolab/kabc/contact.cpp
 ===================================================================
---- kresources/kolab/kabc/contact.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/kolab/kabc/contact.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/kolab/kabc/contact.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/kolab/kabc/contact.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -891,28 +891,28 @@
      type = type & ~KABC::PhoneNumber::Work;
    }
@@ -783,8 +846,8 @@
      return KABC::PhoneNumber::Msg;
 Index: kresources/kolab/shared/kmailconnection.h
 ===================================================================
---- kresources/kolab/shared/kmailconnection.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/kolab/shared/kmailconnection.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/kolab/shared/kmailconnection.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/kolab/shared/kmailconnection.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -79,6 +79,12 @@
     */
    bool connectToKMail();
@@ -826,8 +889,8 @@
  
 Index: kresources/kolab/shared/kmailconnection.cpp
 ===================================================================
---- kresources/kolab/shared/kmailconnection.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/kolab/shared/kmailconnection.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/kolab/shared/kmailconnection.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/kolab/shared/kmailconnection.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -42,6 +42,8 @@
  #include <QDBusAbstractInterface>
  #include <QMap>
@@ -910,8 +973,8 @@
        const bool kmailJustStarted = oldOwner.isEmpty();
 Index: kresources/birthdays/resourcekabcconfig.cpp
 ===================================================================
---- kresources/birthdays/resourcekabcconfig.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/birthdays/resourcekabcconfig.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/birthdays/resourcekabcconfig.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/birthdays/resourcekabcconfig.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -30,6 +30,7 @@
  #include <QGridLayout>
  #include <QBoxLayout>
@@ -931,8 +994,8 @@
    topLayout->addWidget(mAlarmTimeEdit, 1, 1 );
 Index: kresources/akonadi/kcal/akonadi.desktop
 ===================================================================
---- kresources/akonadi/kcal/akonadi.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/akonadi/kcal/akonadi.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/akonadi/kcal/akonadi.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/akonadi/kcal/akonadi.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -26,7 +26,7 @@
  Comment[pl]=Zapewnia dostęp do kalendarzy przechowywanych w katalogach kalendarzy Akonadi
  Comment[pt]=Oferece o acesso aos calendários guardados nas pastas de calendários do Akonadi
@@ -944,8 +1007,8 @@
  Comment[tr]=Akonadi takvim dizinlerindeki takvimlere erişim sağlar
 Index: kresources/akonadi/CMakeLists.txt
 ===================================================================
---- kresources/akonadi/CMakeLists.txt	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/akonadi/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/akonadi/CMakeLists.txt	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/akonadi/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -4,5 +4,7 @@
  # include (ConfigureChecks.cmake)
  # configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -956,8 +1019,8 @@
  add_subdirectory(kcal)
 Index: kresources/groupware/kabc_groupware.desktop
 ===================================================================
---- kresources/groupware/kabc_groupware.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/groupware/kabc_groupware.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/groupware/kabc_groupware.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/groupware/kabc_groupware.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -37,7 +37,7 @@
  Name[pt]=Servidor de Groupware
  Name[pt_BR]=Servidor Groupware
@@ -978,8 +1041,8 @@
  Comment[tr]=Groupware sunucusu üzerindeki kişilere erişim sağlar.
 Index: kresources/groupware/kcal_groupware.desktop
 ===================================================================
---- kresources/groupware/kcal_groupware.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kresources/groupware/kcal_groupware.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kresources/groupware/kcal_groupware.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kresources/groupware/kcal_groupware.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -37,7 +37,7 @@
  Name[pt]=Servidor de Groupware
  Name[pt_BR]=Servidor Groupware
@@ -991,8 +1054,8 @@
  Name[ta]=குழுவாரி சேவகன்
 Index: kmail/kmfolderdir.h
 ===================================================================
---- kmail/kmfolderdir.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/kmfolderdir.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/kmfolderdir.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/kmfolderdir.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -25,6 +25,11 @@
  
    virtual bool isDir() const { return true; }
@@ -1007,8 +1070,8 @@
  
 Index: kmail/accountdialog.cpp
 ===================================================================
---- kmail/accountdialog.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/accountdialog.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/accountdialog.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/accountdialog.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -324,6 +324,8 @@
    connect( mImap.ui.useDefaultIdentityCheck, SIGNAL( toggled(bool) ), this, SLOT( slotIdentityCheckboxChanged() ) );
    connect( mImap.ui.checkCapabilities, SIGNAL(clicked()), SLOT(slotCheckImapCapabilities()));
@@ -1056,8 +1119,8 @@
      edit->close();
 Index: kmail/imapaccountbase.cpp
 ===================================================================
---- kmail/imapaccountbase.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/imapaccountbase.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/imapaccountbase.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/imapaccountbase.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -1,3 +1,4 @@
 +
  /** -*- c++ -*-
@@ -1080,8 +1143,8 @@
                  this, SLOT( slotCheckQueuedFolders() ) );
 Index: kmail/kmailicalifaceimpl.cpp
 ===================================================================
---- kmail/kmailicalifaceimpl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/kmailicalifaceimpl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/kmailicalifaceimpl.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/kmailicalifaceimpl.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -193,6 +193,7 @@
  
  KMailICalIfaceImpl::~KMailICalIfaceImpl()
@@ -1122,8 +1185,8 @@
  #include "kmailicalifaceimpl.moc"
 Index: kmail/subscriptiondialog.h
 ===================================================================
---- kmail/subscriptiondialog.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/subscriptiondialog.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/subscriptiondialog.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/subscriptiondialog.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -89,11 +89,6 @@
            const QStringList&, const QStringList&, const ImapAccountBase::jobData &);
  
@@ -1188,8 +1251,8 @@
        /**
 Index: kmail/localsubscriptiondialog.h
 ===================================================================
---- kmail/localsubscriptiondialog.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/localsubscriptiondialog.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/localsubscriptiondialog.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/localsubscriptiondialog.h	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -53,7 +53,7 @@
        /** reimpl */
        virtual void processFolderListing();
@@ -1201,8 +1264,8 @@
      private:
 Index: kmail/messagelistview/widget.cpp
 ===================================================================
---- kmail/messagelistview/widget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/messagelistview/widget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/messagelistview/widget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/messagelistview/widget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -618,8 +618,7 @@
      menu.addAction( mMainWidget->useAction() );
    } else {
@@ -1215,8 +1278,8 @@
        menu.addAction( mMainWidget->sendAgainAction() );
 Index: kmail/profiles/profile-high-contrast-rc.desktop
 ===================================================================
---- kmail/profiles/profile-high-contrast-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/profiles/profile-high-contrast-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/profiles/profile-high-contrast-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/profiles/profile-high-contrast-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -32,6 +32,7 @@
  Name[ko]=고대비
  Name[lt]=Didelis kontrastas
@@ -1237,8 +1300,8 @@
  
 Index: kmail/profiles/profile-default-rc.desktop
 ===================================================================
---- kmail/profiles/profile-default-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/profiles/profile-default-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/profiles/profile-default-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/profiles/profile-default-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -32,6 +32,7 @@
  Name[ko]=기본값
  Name[lt]=Numatytasis
@@ -1269,8 +1332,8 @@
  
 Index: kmail/profiles/profile-html-rc.desktop
 ===================================================================
---- kmail/profiles/profile-html-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/profiles/profile-html-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/profiles/profile-html-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/profiles/profile-html-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -55,8 +55,8 @@
  Comment[tr]=HTML ön izleme aktif standart profil - daha az güvenli!
  Comment[uk]=Окремий профіль з ввімкненим переглядом HTML - менш безпечний!
@@ -1283,8 +1346,8 @@
  
 Index: kmail/profiles/profile-purist-rc.desktop
 ===================================================================
---- kmail/profiles/profile-purist-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/profiles/profile-purist-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/profiles/profile-purist-rc.desktop	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/profiles/profile-purist-rc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -37,8 +37,8 @@
  Name[tg]=Пурист
  Name[tr]=Sadelikçi
@@ -1307,8 +1370,8 @@
  
 Index: kmail/folderselectiontreewidget.cpp
 ===================================================================
---- kmail/folderselectiontreewidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/folderselectiontreewidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/folderselectiontreewidget.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/folderselectiontreewidget.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -64,6 +64,16 @@
    KMFolder * folder() const
      { return mFolder; };
@@ -1374,8 +1437,8 @@
  
 Index: kmail/kmsystemtray.cpp
 ===================================================================
---- kmail/kmsystemtray.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/kmsystemtray.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/kmsystemtray.cpp	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
++++ kmail/kmsystemtray.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 987536)
 @@ -203,7 +203,7 @@
      }
  
@@ -1417,8 +1480,8 @@
  #include "kmsystemtray.moc"
 Index: kmail/kmmessage.h
 ===================================================================
---- kmail/kmmessage.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 974231)
-+++ kmail/kmmessage.h	(.../branches/KDE/4.2/kdepim)	(wersja 974231)
+--- kmail/kmmessage.h	(.../tags/KDE/4.2.3/kdepim)	(wersja 987536)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim-branch.diff?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim.spec?r1=1.98&r2=1.99&f=u

More information about the pld-cvs-commit mailing list