SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Sat Apr 5 00:28:44 CEST 2008
Author: arekm Date: Fri Apr 4 22:28:44 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.59 -> 1.60)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.59 SOURCES/kdepim-branch.diff:1.60
--- SOURCES/kdepim-branch.diff:1.59 Tue Mar 11 08:31:20 2008
+++ SOURCES/kdepim-branch.diff Sat Apr 5 00:28:38 2008
@@ -1,7 +1,7 @@
Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
===================================================================
---- kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -86,7 +86,7 @@
Comment[ne]=यो ड्राइभरले जिनोकी लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ
Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek
@@ -13,8 +13,8 @@
Comment[ru]=Этот драйвер поддерживает множество моделей мобильных телефонов Nokia и других производителей через библиотеку gnokii
Index: kmobile/devices/gammu/libkmobile_gammu.desktop
===================================================================
---- kmobile/devices/gammu/libkmobile_gammu.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmobile/devices/gammu/libkmobile_gammu.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmobile/devices/gammu/libkmobile_gammu.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmobile/devices/gammu/libkmobile_gammu.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -86,7 +86,7 @@
Comment[ne]=यो ड्राइभरले गामु लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ
Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek
@@ -26,9 +26,14 @@
Comment[ru]=Этот драйвер поддерживает множество моделей мобильных телефонов Nokia и других производителей через библиотеку gammu
Index: kresources/scalix/kabc/scalix.desktop
===================================================================
---- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
-@@ -11,10 +11,12 @@
+--- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -7,14 +7,17 @@
+ Name[de]=Adressbuch auf einem Scalix-Server via KMail
+ Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Scalix μέσω του KMail
+ Name[et]=Aadressiraamat Scalix-serveris (KMaili vahendusel)
++Name[fr]=Carnet d'adresses sur serveur Scalix via KMail
+ Name[it]=Rubrica indirizzi su server Scalix via KMail
Name[ja]=KMail 経由 Scalix サーバのアドレス帳
Name[nds]=Adressbook op Scalix-Server över KMail
Name[nl]=Adresboek op Scalix-server via KMail
@@ -43,9 +48,14 @@
X-KDE-Library=kabc_scalix
Index: kresources/scalix/knotes/scalix.desktop
===================================================================
---- kresources/scalix/knotes/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/scalix/knotes/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
-@@ -11,10 +11,12 @@
+--- kresources/scalix/knotes/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/scalix/knotes/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -7,14 +7,17 @@
+ Name[de]=Notizen auf einem Scalix-Server via KMail
+ Name[el]=Σημειώσεις σε εξυπηρετητή Scalix μέσω του KMail
+ Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
++Name[fr]=Notes sur serveur Scalix via KMail
+ Name[it]=Note su server Scalix via KMail
Name[ja]=KMail 経由 Scalix サーバのメモ
Name[nds]=Notizen op Scalix-Server över KMail
Name[nl]=Notities op Scalix-server via KMail
@@ -60,8 +70,8 @@
X-KDE-Library=knotes_scalix
Index: kresources/scalix/shared/resourcescalixbase.cpp
===================================================================
---- kresources/scalix/shared/resourcescalixbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/scalix/shared/resourcescalixbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kresources/scalix/shared/resourcescalixbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/scalix/shared/resourcescalixbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -33,6 +33,8 @@
#include "resourcescalixbase.h"
#include "kmailconnection.h"
@@ -88,8 +98,8 @@
return possible[chosenLabel];
Index: kresources/scalix/shared/Makefile.am
===================================================================
---- kresources/scalix/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/scalix/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kresources/scalix/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/scalix/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
@@ -107,9 +117,14 @@
kmailicalIface_DCOPIDLNG = true
Index: kresources/scalix/kcal/scalix.desktop
===================================================================
---- kresources/scalix/kcal/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/scalix/kcal/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
-@@ -11,10 +11,12 @@
+--- kresources/scalix/kcal/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/scalix/kcal/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -7,14 +7,17 @@
+ Name[de]=Kalender auf einem Scalix-Server via KMail
+ Name[el]=Ημερολόγιο σε εξυπηρετητή Scalix μέσω του KMail
+ Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
++Name[fr]=Agenda sur serveur Scalix via KMail
+ Name[it]=Calendario su server Scalix via KMail
Name[ja]=KMail 経由 Scalix サーバのカレンダー
Name[nds]=Kalenner op Scalix-Server över KMail
Name[nl]=Agenda op Scalix-server via KMail
@@ -124,8 +139,8 @@
X-KDE-Library=kcal_scalix
Index: kresources/kolab/shared/Makefile.am
===================================================================
---- kresources/kolab/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/kolab/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kresources/kolab/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/kolab/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
@@ -143,8 +158,8 @@
kmailicalIface_DCOPIDLNG = true
Index: kresources/kolab/shared/resourcekolabbase.cpp
===================================================================
---- kresources/kolab/shared/resourcekolabbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/kolab/shared/resourcekolabbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kresources/kolab/shared/resourcekolabbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/kolab/shared/resourcekolabbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -34,6 +34,8 @@
#include "resourcekolabbase.h"
#include "kmailconnection.h"
@@ -168,7 +183,7 @@
Index: kresources/lib/folderselectdialog.h
===================================================================
--- kresources/lib/folderselectdialog.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kresources/lib/folderselectdialog.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
++++ kresources/lib/folderselectdialog.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -0,0 +1,58 @@
+/*
+ This file is part of kdepim.
@@ -230,8 +245,8 @@
+#endif // FOLDERSELECTDIALOG_H
Index: kresources/lib/Makefile.am
===================================================================
---- kresources/lib/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kresources/lib/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kresources/lib/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kresources/lib/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -5,7 +5,7 @@
lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la
@@ -244,7 +259,7 @@
Index: kresources/lib/folderselectdialog.cpp
===================================================================
--- kresources/lib/folderselectdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kresources/lib/folderselectdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
++++ kresources/lib/folderselectdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -0,0 +1,83 @@
+/*
+ This file is part of kdepim.
@@ -331,8 +346,17 @@
+}
Index: certmanager/conf/kleopatra_config_dirserv.desktop
===================================================================
---- certmanager/conf/kleopatra_config_dirserv.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ certmanager/conf/kleopatra_config_dirserv.desktop (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- certmanager/conf/kleopatra_config_dirserv.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ certmanager/conf/kleopatra_config_dirserv.desktop (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -80,7 +80,7 @@
+ Comment[eu]=LDAP direktorio zerbitzuen konfigurazioa
+ Comment[fa]=پیکربندی خدمات فهرست راهنمای LDAP
+ Comment[fi]=Hakemistopalveluiden asetukset
+-Comment[fr]=Configuration des répertoires LDAP
++Comment[fr]=Configuration des services du répertoire LDAP
+ Comment[fy]=Konfiguraasje foar LDAP-tsjinsten
+ Comment[gl]=Configuración dos servicios de directorio LDAP
+ Comment[he]=תצורה של שירותי ספרייה עבור LDAP
@@ -150,7 +150,7 @@
Keywords[nds]=LDAP,Verteken,Deensten
Keywords[ne]=ldap,डाइरेक्टरी,कार्य
@@ -344,8 +368,8 @@
Keywords[ru]=LDAP,службы каталогов
Index: certmanager/lib/cryptplug.h
===================================================================
---- certmanager/lib/cryptplug.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ certmanager/lib/cryptplug.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- certmanager/lib/cryptplug.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ certmanager/lib/cryptplug.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -408,7 +408,7 @@
\note This function <b>must</b> be implemented by each plug-in using
this API specification.
@@ -357,8 +381,8 @@
\brief Information record returned by signing and by encrypting
Index: certmanager/lib/cryptplugwrapper.h
===================================================================
---- certmanager/lib/cryptplugwrapper.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ certmanager/lib/cryptplugwrapper.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- certmanager/lib/cryptplugwrapper.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ certmanager/lib/cryptplugwrapper.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -718,7 +718,7 @@
\return whether the relative feature is implemented or not
@@ -368,10 +392,212 @@
/* \ingroup groupSignAct
+Index: karm/ktimewidget.h
+===================================================================
+--- karm/ktimewidget.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/ktimewidget.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -14,7 +14,7 @@
+ {
+ public:
+ KArmTimeWidget( QWidget* parent = 0, const char* name = 0 );
+- void setTime( int hour, int minute );
++ void setTime( long minutes );
+ long time() const;
+
+ private:
+Index: karm/idletimedetector.cpp
+===================================================================
+--- karm/idletimedetector.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/idletimedetector.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -10,15 +10,18 @@
+ IdleTimeDetector::IdleTimeDetector(int maxIdle)
+ // Trigger a warning after maxIdle minutes
+ {
+- kdDebug(5970) << "IdleTimeDetector::IdleTimeDetector" << endl;
++ kdDebug(5970) << "Entering IdleTimeDetector::IdleTimeDetector" << endl;
+ _maxIdle = maxIdle;
+
+ #ifdef HAVE_LIBXSS
++ kdDebug(5970) << "IdleTimeDetector: LIBXSS detected @ compile time" << endl;
+ int event_base, error_base;
+- if(XScreenSaverQueryExtension(qt_xdisplay(), &event_base, &error_base)) {
++ if(XScreenSaverQueryExtension(qt_xdisplay(), &event_base, &error_base))
++ {
+ _idleDetectionPossible = true;
+ }
+- else {
++ else
++ {
+ _idleDetectionPossible = false;
+ }
+
+@@ -43,9 +46,9 @@
+ {
+ _mit_info = XScreenSaverAllocInfo ();
+ XScreenSaverQueryInfo(qt_xdisplay(), qt_xrootwin(), _mit_info);
+- int idleMinutes = (_mit_info->idle/1000)/secsPerMinute;
+- if (idleMinutes >= _maxIdle)
+- informOverrun(idleMinutes);
++ int idleSeconds = (_mit_info->idle/1000);
++ if (idleSeconds >= _maxIdle)
++ informOverrun(idleSeconds);
+ }
+ #endif // HAVE_LIBXSS
+ }
+@@ -56,38 +59,38 @@
+ }
+
+ #ifdef HAVE_LIBXSS
+-void IdleTimeDetector::informOverrun(int idleMinutes)
++void IdleTimeDetector::informOverrun(int idleSeconds)
+ {
++ kdDebug(5970) << "Entering IdleTimeDetector::informOverrun" << endl;
+ if (!_overAllIdleDetect)
+ return; // preferences say the user does not want idle detection.
+
+ _timer->stop();
+
+- QDateTime start = QDateTime::currentDateTime();
+- QDateTime idleStart = start.addSecs(-60 * _maxIdle);
+- QString backThen = KGlobal::locale()->formatTime(idleStart.time());
++ QDateTime idleStart = QDateTime::currentDateTime().addSecs(-idleSeconds);
++ QString idleStartQString = KGlobal::locale()->formatTime(idleStart.time());
+
+ int id = QMessageBox::warning( 0, i18n("Idle Detection"),
+ i18n("Desktop has been idle since %1."
+- " What should we do?").arg(backThen),
++ " What should we do?").arg(idleStartQString),
+ i18n("Revert && Stop"),
+ i18n("Revert && Continue"),
+ i18n("Continue Timing"),0,2);
+ QDateTime end = QDateTime::currentDateTime();
+- int diff = start.secsTo(end)/secsPerMinute;
++ int diff = idleStart.secsTo(end)/secsPerMinute;
+
+ if (id == 0)
+ {
+ // Revert And Stop
+ kdDebug(5970) << "Now it is " << QDateTime::currentDateTime() << endl;
+ kdDebug(5970) << "Reverting timer to " << KGlobal::locale()->formatTime(idleStart.time()).ascii() << endl;
+- emit(extractTime(idleMinutes+diff)); // we need to subtract the time that has been added during idleness.
++ emit(extractTime(idleSeconds/60+diff)); // we need to subtract the time that has been added during idleness.
+ emit(stopAllTimersAt(idleStart));
+ }
+ else if (id == 1)
+ {
+ // Revert and Continue
+- emit(extractTime(idleMinutes+diff));
++ emit(extractTime(idleSeconds/60+diff));
+ _timer->start(testInterval);
+ }
+ else
+Index: karm/ktimewidget.cpp
+===================================================================
+--- karm/ktimewidget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/ktimewidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -8,6 +8,7 @@
+ #include <qwidget.h>
+
+ #include <klocale.h> // i18n
++#include <kglobal.h>
+ #include "ktimewidget.h"
+
+ enum ValidatorType { HOUR, MINUTE };
+@@ -97,15 +98,19 @@
+ setFocusProxy( _hourLE );
+ }
+
+-void KArmTimeWidget::setTime( int hour, int minute )
++void KArmTimeWidget::setTime( long minutes )
+ {
+ QString dummy;
++ long hourpart = labs(minutes) / 60;
++ long minutepart = labs(minutes) % 60;
+
+- dummy.setNum( hour );
++ dummy.setNum( hourpart );
++ if (minutes < 0)
++ dummy = KGlobal::locale()->negativeSign() + dummy;
+ _hourLE->setText( dummy );
+
+- dummy.setNum( abs(minute) );
+- if (abs(minute) < 10 ) {
++ dummy.setNum( minutepart );
++ if (minutepart < 10 ) {
+ dummy = QString::fromLatin1( "0" ) + dummy;
+ }
+ _minuteLE->setText( dummy );
+@@ -113,12 +118,12 @@
+
+ long KArmTimeWidget::time() const
+ {
+- bool ok;
++ bool ok, isNegative;
+ int h, m;
+
+- h = _hourLE->text().toInt( &ok );
++ h = abs(_hourLE->text().toInt( &ok ));
+ m = _minuteLE->text().toInt( &ok );
++ isNegative = _hourLE->text().startsWith(KGlobal::locale()->negativeSign());
+
+- // if h is negative, we have to *subtract* m
+- return h * 60 + ( ( h < 0) ? -1 : 1 ) * m;
++ return (h * 60 + m) * ((isNegative) ? -1 : 1);
+ }
+Index: karm/task.cpp
+===================================================================
+--- karm/task.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/task.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -62,13 +62,13 @@
+
+ if (icons == 0) {
+ icons = new QPtrVector<QPixmap>(8);
+- KIconLoader* kil = new KIconLoader("karm"); // always load icons from the KArm application
++ KIconLoader kil("karm"); // always load icons from the KArm application
+ for (int i=0; i<8; i++)
+ {
+ QPixmap *icon = new QPixmap();
+ QString name;
+ name.sprintf("watch-%d.xpm",i);
+- *icon = kil->loadIcon( name, KIcon::User );
++ *icon = kil.loadIcon( name, KIcon::User );
+ icons->insert(i,icon);
+ }
+ }
+Index: karm/edittaskdialog.cpp
+===================================================================
+--- karm/edittaskdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/edittaskdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -298,8 +298,8 @@
+ {
+ _name->setText( name );
+
+- _timeTW->setTime( time / 60, time % 60 );
+- _sessionTW->setTime( session / 60, session % 60 );
++ _timeTW->setTime( time );
++ _sessionTW->setTime( session );
+ origTime = time;
+ origSession = session;
+ }
+Index: karm/karmutility.cpp
+===================================================================
+--- karm/karmutility.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ karm/karmutility.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -14,7 +14,9 @@
+ time.sprintf("%.2f", minutes / 60.0);
+ time.replace( '.', KGlobal::locale()->decimalSymbol() );
+ }
+- else time.sprintf("%ld:%02ld", minutes / 60, labs(minutes % 60));
++ else time.sprintf("%s%ld:%02ld",
++ (minutes < 0) ? KGlobal::locale()->negativeSign().utf8().data() : "",
++ labs(minutes / 60), labs(minutes % 60));
+ return time;
+ }
+
Index: kdgantt/KDGanttViewTaskItem.h
===================================================================
---- kdgantt/KDGanttViewTaskItem.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kdgantt/KDGanttViewTaskItem.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kdgantt/KDGanttViewTaskItem.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kdgantt/KDGanttViewTaskItem.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -60,8 +60,10 @@
void setStartTime( const QDateTime& start );
void setEndTime( const QDateTime& end );
@@ -384,10 +610,23 @@
void initItem();
void hideMe();
QBrush myBrush, undefinedBrush;
+Index: kdgantt/KDGanttViewSubwidgets.cpp
+===================================================================
+--- kdgantt/KDGanttViewSubwidgets.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kdgantt/KDGanttViewSubwidgets.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -1252,7 +1252,7 @@
+ computeTicks();
+ // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
+ if (myGanttView && myGanttView->myCanvasView)
+- myGanttView->myCanvasView->updateScrollBars();
++ myGanttView->myCanvasView->updateHorScrollBar();
+ }
+
+
Index: kmail/snippet_widget.h
===================================================================
---- kmail/snippet_widget.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/snippet_widget.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/snippet_widget.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/snippet_widget.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -1,95 +0,0 @@
-/***************************************************************************
- * snippet feature from kdevelop/plugins/snippet/ *
@@ -486,8 +725,8 @@
-#endif
Index: kmail/snippet_widget.cpp
===================================================================
---- kmail/snippet_widget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/snippet_widget.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/snippet_widget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/snippet_widget.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -1,957 +0,0 @@
-/***************************************************************************
- * snippet feature from kdevelop/plugins/snippet/ *
@@ -1448,8 +1687,8 @@
-
Index: kmail/kmailicalifaceimpl.cpp
===================================================================
---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -1301,7 +1301,8 @@
// French
@@ -1463,7 +1702,7 @@
Index: kmail/encodingdetector.h
===================================================================
--- kmail/encodingdetector.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/encodingdetector.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
++++ kmail/encodingdetector.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -0,0 +1,166 @@
+/*
+ This file was taken from the KDE 4.x libraries and backported to Qt 3.
@@ -1633,8 +1872,8 @@
+#endif
Index: kmail/kmmessage.h
===================================================================
---- kmail/kmmessage.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmmessage.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmmessage.h (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmmessage.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -627,9 +627,6 @@
/** Delete all body parts. */
void deleteBodyParts();
@@ -1647,8 +1886,8 @@
void setStatusFields();
Index: kmail/newfolderdialog.cpp
===================================================================
---- kmail/newfolderdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/newfolderdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/newfolderdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/newfolderdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -148,7 +148,7 @@
}
if ( mFolder->folderType() == KMFolderTypeCachedImap ) {
@@ -1675,8 +1914,8 @@
KMessageBox::error( this, i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ) );
Index: kmail/kmreadermainwin.cpp
===================================================================
---- kmail/kmreadermainwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmreadermainwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -496,6 +496,7 @@
f.setFamily( font );
mReaderWin->cssHelper()->setBodyFont( f );
@@ -1696,7 +1935,7 @@
Index: kmail/encodingdetector_ja_p.h
===================================================================
--- kmail/encodingdetector_ja_p.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/encodingdetector_ja_p.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
++++ kmail/encodingdetector_ja_p.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -0,0 +1,126 @@
+/*
+ * This file is part of the KDE libraries
@@ -1826,8 +2065,8 @@
+#endif /* GUESS_JA_H */
Index: kmail/Makefile.am
===================================================================
---- kmail/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -69,7 +69,8 @@
kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
@@ -1849,8 +2088,8 @@
snippetitem.cpp \
Index: kmail/kmreaderwin.cpp
===================================================================
---- kmail/kmreaderwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmreaderwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmreaderwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmreaderwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -764,10 +764,9 @@
void KMReaderWin::slotLevelQuote( int l )
{
@@ -1904,8 +2143,8 @@
KMMessage* msg = message();
Index: kmail/kmmessage.cpp
===================================================================
---- kmail/kmmessage.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmmessage.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmmessage.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmmessage.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -3126,12 +3126,6 @@
mMsg->Body().DeleteBodyParts();
}
@@ -1922,7 +2161,7 @@
Index: kmail/snippetwidget.h
===================================================================
--- kmail/snippetwidget.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/snippetwidget.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
++++ kmail/snippetwidget.h (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -0,0 +1,95 @@
+/***************************************************************************
+ * snippet feature from kdevelop/plugins/snippet/ *
@@ -2021,8 +2260,8 @@
+#endif
Index: kmail/messageactions.cpp
===================================================================
---- kmail/messageactions.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/messageactions.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/messageactions.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/messageactions.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -70,7 +70,7 @@
this, SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
@@ -2034,8 +2273,8 @@
Index: kmail/kmcommands.cpp
===================================================================
---- kmail/kmcommands.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
-+++ kmail/kmcommands.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
+--- kmail/kmcommands.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmcommands.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
@@ -3369,7 +3369,29 @@
deleteLater();
}
@@ -2144,10 +2383,31 @@
KMMessage *newMsg = new KMMessage();
newMsg->fromDwString( msg->asDwString() );
newMsg->setStatus( msg->status() );
+Index: kmail/kmfoldercachedimap.cpp
+===================================================================
+--- kmail/kmfoldercachedimap.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 793728)
++++ kmail/kmfoldercachedimap.cpp (.../branches/KDE/3.5/kdepim) (wersja 793728)
+@@ -484,8 +484,15 @@
+ uidMapDirty = true;
+ }
+
++ KMFolderOpener openThis(folder(), "KMFolderCachedImap::addMsgInternal");
++ int rc = openThis.openResult();
++ if ( rc ) {
++ kdDebug(5006) << k_funcinfo << "open: " << rc << " of folder: " << label() << endl;
++ return rc;
++ }
++
+ // Add the message
+- int rc = KMFolderMaildir::addMsg(msg, index_return);
++ rc = KMFolderMaildir::addMsg(msg, index_return);
+
+ if( newMail && ( imapPath() == "/INBOX/" || ( !GlobalSettings::self()->filterOnlyDIMAPInbox()
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdepim-branch.diff?r1=1.59&r2=1.60&f=u
More information about the pld-cvs-commit
mailing list