SOURCES: kdepim-branch.diff - Updated

adgor adgor at pld-linux.org
Thu Sep 21 22:19:46 CEST 2006 

Author: adgor                        Date: Thu Sep 21 20:19:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated

---- Files affected:
SOURCES:
   kdepim-branch.diff (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.22 SOURCES/kdepim-branch.diff:1.23
--- SOURCES/kdepim-branch.diff:1.22	Wed Sep 20 18:33:41 2006
+++ SOURCES/kdepim-branch.diff	Thu Sep 21 22:19:40 2006
@@ -1,7 +1,7 @@
 Index: akregator/ChangeLog
 ===================================================================
---- akregator/ChangeLog	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/ChangeLog	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/ChangeLog	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/ChangeLog	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -2,6 +2,23 @@
  ===================
  (c) 2004-2006 the Akregator authors.
@@ -28,8 +28,8 @@
  
 Index: akregator/src/aboutdata.cpp
 ===================================================================
---- akregator/src/aboutdata.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/aboutdata.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/aboutdata.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/aboutdata.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -31,7 +31,7 @@
  AboutData::AboutData()
      : KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A KDE Feed Aggregator"),
@@ -41,8 +41,8 @@
      addAuthor( "Teemu Rytilahti", I18N_NOOP("Developer"), "tpr at d5k.net" );
 Index: akregator/src/articleviewer.cpp
 ===================================================================
---- akregator/src/articleviewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/articleviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/articleviewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/articleviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -187,8 +187,7 @@
      const QColorGroup & cg = QApplication::palette().active();
      
@@ -201,8 +201,8 @@
  
 Index: akregator/src/storagefactory.h
 ===================================================================
---- akregator/src/storagefactory.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/storagefactory.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/storagefactory.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/storagefactory.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -25,6 +25,8 @@
  #ifndef AKREGATOR_BACKEND_STORAGEFACTORY_H
  #define AKREGATOR_BACKEND_STORAGEFACTORY_H
@@ -223,8 +223,8 @@
      
 Index: akregator/src/feed.cpp
 ===================================================================
---- akregator/src/feed.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/feed.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/feed.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/feed.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -46,6 +46,7 @@
  #include "feedstorage.h"
  #include "storage.h"
@@ -259,8 +259,8 @@
  
 Index: akregator/src/akregator.kcfg
 ===================================================================
---- akregator/src/akregator.kcfg	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/akregator.kcfg	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/akregator.kcfg	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/akregator.kcfg	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -44,8 +44,10 @@
   <group name="HTML Settings" >
    <entry key="Fonts" type="StringList" />
@@ -274,8 +274,8 @@
    </entry>
 Index: akregator/src/articlelistview.cpp
 ===================================================================
---- akregator/src/articlelistview.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/articlelistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/articlelistview.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/articlelistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -424,6 +424,11 @@
          setSelected(next, true);
          setCurrentItem(next);
@@ -317,7 +317,7 @@
 Index: akregator/src/librss/feeddetector.h
 ===================================================================
 --- akregator/src/librss/feeddetector.h	(.../tags/KDE/3.5.4/kdepim)	(revision 0)
-+++ akregator/src/librss/feeddetector.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
++++ akregator/src/librss/feeddetector.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -0,0 +1,80 @@
 +/*
 +    This file is part of Akregator.
@@ -401,8 +401,8 @@
 +#endif //LIBRSS_FEEDDETECTOR_H
 Index: akregator/src/librss/loader.cpp
 ===================================================================
---- akregator/src/librss/loader.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/librss/loader.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/librss/loader.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/librss/loader.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -10,6 +10,7 @@
   */
  #include "loader.h"
@@ -512,8 +512,8 @@
  #include "loader.moc"
 Index: akregator/src/librss/Makefile.am
 ===================================================================
---- akregator/src/librss/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/librss/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/librss/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/librss/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -9,7 +9,7 @@
    loader.h librss.h enclosure.h
  
@@ -526,7 +526,7 @@
 Index: akregator/src/librss/feeddetector.cpp
 ===================================================================
 --- akregator/src/librss/feeddetector.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 0)
-+++ akregator/src/librss/feeddetector.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
++++ akregator/src/librss/feeddetector.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -0,0 +1,179 @@
 +/*
 +    This file is part of Akregator.
@@ -709,8 +709,8 @@
 +}
 Index: akregator/src/mk4storage/Makefile.am
 ===================================================================
---- akregator/src/mk4storage/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/mk4storage/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/mk4storage/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/mk4storage/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -21,10 +21,7 @@
  libakregator_mk4storage_plugin_la_SOURCES = feedstoragemk4impl.cpp \
                                              storagemk4impl.cpp \
@@ -725,8 +725,8 @@
  
 Index: akregator/src/mk4storage/storagefactorymk4impl.cpp
 ===================================================================
---- akregator/src/mk4storage/storagefactorymk4impl.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/mk4storage/storagefactorymk4impl.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/mk4storage/storagefactorymk4impl.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/mk4storage/storagefactorymk4impl.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -23,8 +23,8 @@
  */
  #include "storagefactorymk4impl.h"
@@ -757,8 +757,8 @@
  }
 Index: akregator/src/feedlistview.cpp
 ===================================================================
---- akregator/src/feedlistview.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/feedlistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/feedlistview.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/feedlistview.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -72,47 +72,8 @@
      DisconnectNodeVisitor* disconnectNodeVisitor;
      CreateItemVisitor* createItemVisitor;
@@ -907,8 +907,8 @@
              e->accept();
 Index: akregator/src/plugin.h
 ===================================================================
---- akregator/src/plugin.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/plugin.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/plugin.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/plugin.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -4,6 +4,8 @@
  #ifndef AKREGATOR_PLUGIN_H
  #define AKREGATOR_PLUGIN_H
@@ -929,8 +929,8 @@
              virtual ~Plugin();
 Index: akregator/src/Makefile.am
 ===================================================================
---- akregator/src/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -39,7 +39,8 @@
  #########################################################################
  
@@ -943,8 +943,8 @@
  # this is a lib shared by both the KPart and the main application
 Index: akregator/src/pageviewer.cpp
 ===================================================================
---- akregator/src/pageviewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/pageviewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/pageviewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -175,7 +175,7 @@
  // Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
  void PageViewer::slotForward()
@@ -956,8 +956,8 @@
          ++tmp;
 Index: akregator/src/viewer.cpp
 ===================================================================
---- akregator/src/viewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/viewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/viewer.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/viewer.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -51,7 +51,7 @@
      : KHTMLPart(parent, name), m_url(0)
  {
@@ -969,8 +969,8 @@
      setPluginsEnabled(true);
 Index: akregator/src/utils.h
 ===================================================================
---- akregator/src/utils.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/utils.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/utils.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/utils.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -43,6 +43,14 @@
      */
  
@@ -988,8 +988,8 @@
  }
 Index: akregator/src/storagefactoryregistry.h
 ===================================================================
---- akregator/src/storagefactoryregistry.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/storagefactoryregistry.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/storagefactoryregistry.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/storagefactoryregistry.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -25,6 +25,8 @@
  #ifndef AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H
  #define AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H
@@ -1010,8 +1010,8 @@
          static StorageFactoryRegistry* self();
 Index: akregator/src/akregator_run.cpp
 ===================================================================
---- akregator/src/akregator_run.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/akregator_run.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/akregator_run.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/akregator_run.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -31,7 +31,7 @@
  
  
@@ -1023,8 +1023,8 @@
      m_openingMode = mode;
 Index: akregator/src/storage.h
 ===================================================================
---- akregator/src/storage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/storage.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/storage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/storage.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -27,6 +27,8 @@
  
  #include <qobject.h>
@@ -1045,8 +1045,8 @@
  
 Index: akregator/src/aboutdata.h
 ===================================================================
---- akregator/src/aboutdata.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/aboutdata.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/aboutdata.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/aboutdata.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -28,7 +28,7 @@
  #include <kaboutdata.h>
  #include <kdepimmacros.h>
@@ -1059,7 +1059,7 @@
 Index: akregator/src/akregator_export.h
 ===================================================================
 --- akregator/src/akregator_export.h	(.../tags/KDE/3.5.4/kdepim)	(revision 0)
-+++ akregator/src/akregator_export.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
++++ akregator/src/akregator_export.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -0,0 +1,28 @@
 +/*
 +    This file is part of Akregator.
@@ -1091,8 +1091,8 @@
 +#endif
 Index: akregator/src/akregator.desktop
 ===================================================================
---- akregator/src/akregator.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/akregator.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/akregator.desktop	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -58,7 +58,6 @@
  Comment[fi]=RSS-syĂśtelukija
  Comment[fr]=Un lecteur de flux RSS pour KDE
@@ -1103,8 +1103,8 @@
  Comment[it]=Un concentratore KDE per RSS
 Index: akregator/src/feedstorage.h
 ===================================================================
---- akregator/src/feedstorage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/feedstorage.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/feedstorage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/feedstorage.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -27,6 +27,8 @@
  #include <qobject.h>
  #include <qstring.h>
@@ -1134,8 +1134,8 @@
      
 Index: akregator/src/utils.cpp
 ===================================================================
---- akregator/src/utils.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/utils.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/utils.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/utils.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -44,4 +44,16 @@
      return hash;
  }
@@ -1155,8 +1155,8 @@
 +}
 Index: akregator/src/articleinterceptor.h
 ===================================================================
---- akregator/src/articleinterceptor.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/articleinterceptor.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/articleinterceptor.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/articleinterceptor.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -1,15 +1,19 @@
  #ifndef AKREGATOR_ARTICLEINTERCEPTOR_H
  #define AKREGATOR_ARTICLEINTERCEPTOR_H
@@ -1190,8 +1190,8 @@
  
 Index: akregator/src/akregator_view.cpp
 ===================================================================
---- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- akregator/src/akregator_view.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ akregator/src/akregator_view.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -819,6 +819,9 @@
          m_articleViewer->slotShowSummary(node);
      }
@@ -1389,7 +1389,7 @@
 Index: pixmaps/Makefile.am
 ===================================================================
 --- pixmaps/Makefile.am	(.../tags/KDE/3.5.4/kdepim)	(revision 0)
-+++ pixmaps/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 586795)
++++ pixmaps/Makefile.am	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -0,0 +1,2 @@
 +kdepimicondir = $(kde_datadir)/kdepim/icons
 +kdepimicon_ICON = AUTO                                                                                                                                         
@@ -1504,8 +1504,8 @@
 
 Index: kmobile/kmobile.desktop
 ===================================================================
---- kmobile/kmobile.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmobile/kmobile.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmobile/kmobile.desktop	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -12,6 +12,7 @@
  Name[nn]=KMobil
  Name[sv]=Kmobile
@@ -1516,8 +1516,8 @@
  GenericName[be]=ĐšŃ–Ń€Đ°Đ˛Đ°Đ˝ŃŒĐ˝Đľ ĐźĐ°ĐąŃ–ĐťŃŒĐ˝Ń‹ĐźŃ– прыНадаПі
 Index: kresources/egroupware/xmlrpciface.cpp
 ===================================================================
---- kresources/egroupware/xmlrpciface.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kresources/egroupware/xmlrpciface.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kresources/egroupware/xmlrpciface.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kresources/egroupware/xmlrpciface.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -200,7 +200,14 @@
    {
        case QVariant::String:
@@ -1536,8 +1536,8 @@
        case QVariant::Double:
 Index: kresources/groupwise/soap/types.xsd
 ===================================================================
---- kresources/groupwise/soap/types.xsd	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kresources/groupwise/soap/types.xsd	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kresources/groupwise/soap/types.xsd	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kresources/groupwise/soap/types.xsd	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -524,7 +524,7 @@
  					<xs:element name="officialVersion" type="xs:unsignedInt" minOccurs="0"/>
  					<xs:element name="currentVersion" type="xs:unsignedInt" minOccurs="0"/>
@@ -1549,8 +1549,8 @@
  				</xs:sequence>
 Index: kresources/groupwise/kioslave/groupwise.cpp
 ===================================================================
---- kresources/groupwise/kioslave/groupwise.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kresources/groupwise/kioslave/groupwise.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kresources/groupwise/kioslave/groupwise.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kresources/groupwise/kioslave/groupwise.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -21,6 +21,8 @@
  
  #include "groupwiseserver.h"
@@ -1575,8 +1575,8 @@
      QString user = url.user();
 Index: certmanager/conf/kleopatra_config_dnorder.desktop
 ===================================================================
---- certmanager/conf/kleopatra_config_dnorder.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ certmanager/conf/kleopatra_config_dnorder.desktop	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- certmanager/conf/kleopatra_config_dnorder.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ certmanager/conf/kleopatra_config_dnorder.desktop	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -72,7 +72,7 @@
  Comment[he]=הגדרה ׊ל הץדר ׊בהם מאפייני DN ×ž×•×Ś×’×™×
  Comment[hu]=A DN-attribĂştumok megjelenĂ­tĂŠsi sorrendjĂŠnek beĂĄllĂ­tĂĄsa
@@ -1588,8 +1588,8 @@
  Comment[lt]=KonfigĹŤruoti DN savybiĹł rodymo tvarkÄ

 Index: karm/timekard.cpp
 ===================================================================
---- karm/timekard.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ karm/timekard.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- karm/timekard.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ karm/timekard.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -343,7 +343,7 @@
  
  QDate Week::end() const
@@ -1601,8 +1601,8 @@
  QString Week::name() const
 Index: karm/support/karm.desktop
 ===================================================================
---- karm/support/karm.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ karm/support/karm.desktop	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- karm/support/karm.desktop	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ karm/support/karm.desktop	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -9,6 +9,7 @@
  Name[sv]=Karm
  Name[ta]=KŕŽ
ம்
@@ -1613,8 +1613,8 @@
  GenericName[ar]=ŘŹŘŻŮˆŮ„ الŮ
ŮˆŘ§ŘšŮŠŘŻ
 Index: kmail/kmfoldersearch.h
 ===================================================================
---- kmail/kmfoldersearch.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmfoldersearch.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmfoldersearch.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmfoldersearch.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -71,6 +71,7 @@
    bool running() const { return mRunning; }
    void stop();
@@ -1642,8 +1642,8 @@
  public:
 Index: kmail/kmreadermainwin.rc
 ===================================================================
---- kmail/kmreadermainwin.rc	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmreadermainwin.rc	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmreadermainwin.rc	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmreadermainwin.rc	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -1,5 +1,5 @@
  <!DOCTYPE kpartgui>
 -<kpartgui version="4" name="kmreadermainwin" >
@@ -1678,8 +1678,8 @@
  </kpartgui>
 Index: kmail/searchwindow.h
 ===================================================================
---- kmail/searchwindow.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/searchwindow.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/searchwindow.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/searchwindow.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -86,13 +86,13 @@
     * @param curFolder The folder to use as the new base for searches.
     */
@@ -1727,8 +1727,8 @@
  
 Index: kmail/kmfilterdlg.cpp
 ===================================================================
---- kmail/kmfilterdlg.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmfilterdlg.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmfilterdlg.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmfilterdlg.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -69,6 +69,12 @@
  	   "it is deleted, but you can always leave the "
  	   "dialog by clicking <em>Cancel</em> to discard the "
@@ -1905,8 +1905,8 @@
  // class KMFilterActionWidget
 Index: kmail/kmail.antispamrc
 ===================================================================
---- kmail/kmail.antispamrc	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmail.antispamrc	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmail.antispamrc	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmail.antispamrc	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -106,6 +106,11 @@
  UseRegExp=0
  SupportsBayes=1
@@ -1943,8 +1943,8 @@
  ScoreThresholdRegexp=
 Index: kmail/kmmainwin.rc
 ===================================================================
---- kmail/kmmainwin.rc	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmmainwin.rc	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmmainwin.rc	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmmainwin.rc	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -2,7 +2,7 @@
       the same menu entries at the same place in KMail and Kontact  -->
  
@@ -1964,8 +1964,8 @@
     <Action name="send_again" />
 Index: kmail/imapaccountbase.cpp
 ===================================================================
---- kmail/imapaccountbase.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/imapaccountbase.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/imapaccountbase.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/imapaccountbase.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -976,7 +976,8 @@
  
      QValueList<QGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
@@ -1997,8 +1997,8 @@
    }
 Index: kmail/kmheaders.cpp
 ===================================================================
---- kmail/kmheaders.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmheaders.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmheaders.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmheaders.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -1359,7 +1359,7 @@
      int msgCountToFilter = msgList->count();
      for (KMMsgBase* msgBase=msgList->first(); msgBase; msgBase=msgList->next()) {
@@ -2010,8 +2010,8 @@
          KPIM::BroadcastStatus::instance()->setStatusMsg( statusMsg );
 Index: kmail/folderrequester.cpp
 ===================================================================
---- kmail/folderrequester.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/folderrequester.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/folderrequester.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/folderrequester.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -100,10 +100,14 @@
  void FolderRequester::setFolder( const QString &idString )
  {
@@ -2030,10 +2030,46 @@
      mFolder = 0;
    }
    mFolderId = idString;
+Index: kmail/kmacctlocal.cpp
+===================================================================
+--- kmail/kmacctlocal.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmacctlocal.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
+@@ -31,7 +31,7 @@
+ //-----------------------------------------------------------------------------
+ KMAcctLocal::KMAcctLocal(AccountManager* aOwner, const QString& aAccountName, uint id):
+   KMAccount(aOwner, aAccountName, id), mHasNewMail( false ),
+-  mProcessingNewMail( false ), mAddedOk( true ), mNumMsgs( 0 ),
++  mAddedOk( true ), mNumMsgs( 0 ),
+   mMsgsFetched( 0 ), mMailFolder( 0 )
+ {
+   mLock = procmail_lockfile;
+@@ -73,14 +73,9 @@
+ //-----------------------------------------------------------------------------
+ void KMAcctLocal::processNewMail(bool)
+ {
+-  if ( mProcessingNewMail )
+-    return;
+-
+   mHasNewMail = false;
+-  mProcessingNewMail = true;
+ 
+   if ( !preProcess() ) {
+-    mProcessingNewMail = false;
+     return;
+   }
+ 
+@@ -99,7 +94,6 @@
+   }
+ 
+   postProcess();
+-  mProcessingNewMail = false;
+ }
+ 
+ 
 Index: kmail/kmedit.cpp
 ===================================================================
---- kmail/kmedit.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmedit.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmedit.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmedit.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -248,8 +248,6 @@
                                                  col1, col2, col3, col4,
                                                  mSpellConfig );
@@ -2045,8 +2081,8 @@
  }
 Index: kmail/kmmessage.h
 ===================================================================
---- kmail/kmmessage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmmessage.h	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmmessage.h	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmmessage.h	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -33,7 +33,7 @@
  class KMMessagePart;
  class KMMsgInfo;
@@ -2076,8 +2112,8 @@
        "From local at domain.invalid Sat Jun 12 14:00:00 2004\n".
 Index: kmail/kmmsgdict.cpp
 ===================================================================
---- kmail/kmmsgdict.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmmsgdict.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmmsgdict.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmmsgdict.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -210,7 +210,7 @@
        << "null pointer to storage. Requested serial: " << msgSerNum
        << endl;
@@ -2113,8 +2149,8 @@
  
 Index: kmail/kmacctcachedimap.cpp
 ===================================================================
---- kmail/kmacctcachedimap.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmacctcachedimap.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmacctcachedimap.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmacctcachedimap.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -209,7 +209,7 @@
  
  void KMAcctCachedImap::processNewMail( bool /*interactive*/ )
@@ -2145,8 +2181,8 @@
          // empty namespaces are included in the "normal" listing
 Index: kmail/kmreadermainwin.cpp
 ===================================================================
---- kmail/kmreadermainwin.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 586795)
-+++ kmail/kmreadermainwin.cpp	(.../branches/KDE/3.5/kdepim)	(revision 586795)
+--- kmail/kmreadermainwin.cpp	(.../tags/KDE/3.5.4/kdepim)	(revision 587058)
++++ kmail/kmreadermainwin.cpp	(.../branches/KDE/3.5/kdepim)	(revision 587058)
 @@ -41,6 +41,7 @@
  #include "kmfolder.h"
  #include "kmmainwidget.h"
@@ -2298,8 +2334,8 @@
        menu->insertSeparator();
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.22&r2=1.23&f=u

More information about the pld-cvs-commit mailing list