SOURCES: kdepim-branch.diff - update (fix corrutption bug; doesn't...
arekm
arekm at pld-linux.org
Tue Mar 11 08:31:26 CET 2008
Author: arekm Date: Tue Mar 11 07:31:26 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update (fix corrutption bug; doesn't affect vanilla 3.5.9)
---- Files affected:
SOURCES:
kdepim-branch.diff (1.58 -> 1.59)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.58 SOURCES/kdepim-branch.diff:1.59
--- SOURCES/kdepim-branch.diff:1.58 Sat Mar 1 22:00:25 2008
+++ SOURCES/kdepim-branch.diff Tue Mar 11 08:31:20 2008
@@ -1,7 +1,33 @@
+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)
+@@ -86,7 +86,7 @@
+ Comment[ne]=यो ड्राइभरले जिनोकी लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gnokii-biblioteket
+-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gnokii
++Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowych Nokia i innych za pomocą biblioteki gnokii
+ Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gnokii'
+ Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gnokii
+ 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)
+@@ -86,7 +86,7 @@
+ Comment[ne]=यो ड्राइभरले गामु लाइब्रेरीबाट धेरै नोकिया र अन्य मोबाइल फोन समर्थन गर्छ
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gammu-biblioteket
+-Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowychNokia i innych za pomocą biblioteki gammu
++Comment[pl]=Ten sterownik obsługuje wiele telefonów komórkowych Nokia i innych za pomocą biblioteki gammu
+ Comment[pt]=Este controlador suportar muitos NOKIAs, bem como outros telemóveis, com a biblioteca 'gammu'
+ Comment[pt_BR]=Este driver suporta muitos telefones móveis, NOKIA e outros, via biblioteca gammu
+ Comment[ru]=Этот драйвер поддерживает множество моделей мобильных телефонов Nokia и других производителей через библиотеку gammu
Index: kresources/scalix/kabc/scalix.desktop
===================================================================
---- kresources/scalix/kabc/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/scalix/kabc/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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 @@
Name[ja]=KMail 経由 Scalix サーバのアドレス帳
Name[nds]=Adressbook op Scalix-Server över KMail
@@ -17,8 +43,8 @@
X-KDE-Library=kabc_scalix
Index: kresources/scalix/knotes/scalix.desktop
===================================================================
---- kresources/scalix/knotes/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/scalix/knotes/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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 @@
Name[ja]=KMail 経由 Scalix サーバのメモ
Name[nds]=Notizen op Scalix-Server över KMail
@@ -34,8 +60,8 @@
X-KDE-Library=knotes_scalix
Index: kresources/scalix/shared/resourcescalixbase.cpp
===================================================================
---- kresources/scalix/shared/resourcescalixbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/scalix/shared/resourcescalixbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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)
@@ -33,6 +33,8 @@
#include "resourcescalixbase.h"
#include "kmailconnection.h"
@@ -62,8 +88,8 @@
return possible[chosenLabel];
Index: kresources/scalix/shared/Makefile.am
===================================================================
---- kresources/scalix/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/scalix/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
@@ -81,8 +107,8 @@
kmailicalIface_DCOPIDLNG = true
Index: kresources/scalix/kcal/scalix.desktop
===================================================================
---- kresources/scalix/kcal/scalix.desktop (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/scalix/kcal/scalix.desktop (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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 @@
Name[ja]=KMail 経由 Scalix サーバのカレンダー
Name[nds]=Kalenner op Scalix-Server över KMail
@@ -98,8 +124,8 @@
X-KDE-Library=kcal_scalix
Index: kresources/kolab/shared/Makefile.am
===================================================================
---- kresources/kolab/shared/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/kolab/shared/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/lib $(all_includes)
@@ -117,8 +143,8 @@
kmailicalIface_DCOPIDLNG = true
Index: kresources/kolab/shared/resourcekolabbase.cpp
===================================================================
---- kresources/kolab/shared/resourcekolabbase.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/kolab/shared/resourcekolabbase.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- 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)
@@ -34,6 +34,8 @@
#include "resourcekolabbase.h"
#include "kmailconnection.h"
@@ -142,7 +168,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 781012)
++++ kresources/lib/folderselectdialog.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -0,0 +1,58 @@
+/*
+ This file is part of kdepim.
@@ -204,8 +230,8 @@
+#endif // FOLDERSELECTDIALOG_H
Index: kresources/lib/Makefile.am
===================================================================
---- kresources/lib/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kresources/lib/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kresources/lib/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kresources/lib/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -5,7 +5,7 @@
lib_LTLIBRARIES = libkgroupwarebase.la libkgroupwaredav.la
@@ -218,7 +244,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 781012)
++++ kresources/lib/folderselectdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -0,0 +1,83 @@
+/*
+ This file is part of kdepim.
@@ -303,10 +329,23 @@
+{
+ event->ignore();
+}
+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)
+@@ -150,7 +150,7 @@
+ Keywords[nds]=LDAP,Verteken,Deensten
+ Keywords[ne]=ldap,डाइरेक्टरी,कार्य
+ Keywords[nn]=ldap,katalog,tenester
+-Keywords[pl]=ldap,katalog,usługi katalogowe,usługi,LDAP
++Keywords[pl]=katalog,usługi katalogowe,usługi,LDAP
+ Keywords[pt]=ldap,directório,serviços
+ Keywords[pt_BR]=ldap,diretório,serviços
+ Keywords[ru]=LDAP,службы каталогов
Index: certmanager/lib/cryptplug.h
===================================================================
---- certmanager/lib/cryptplug.h (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ certmanager/lib/cryptplug.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- certmanager/lib/cryptplug.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ certmanager/lib/cryptplug.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -408,7 +408,7 @@
\note This function <b>must</b> be implemented by each plug-in using
this API specification.
@@ -318,8 +357,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 781012)
-+++ certmanager/lib/cryptplugwrapper.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- certmanager/lib/cryptplugwrapper.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ certmanager/lib/cryptplugwrapper.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -718,7 +718,7 @@
\return whether the relative feature is implemented or not
@@ -331,8 +370,8 @@
/* \ingroup groupSignAct
Index: kdgantt/KDGanttViewTaskItem.h
===================================================================
---- kdgantt/KDGanttViewTaskItem.h (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kdgantt/KDGanttViewTaskItem.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kdgantt/KDGanttViewTaskItem.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kdgantt/KDGanttViewTaskItem.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -60,8 +60,10 @@
void setStartTime( const QDateTime& start );
void setEndTime( const QDateTime& end );
@@ -347,8 +386,8 @@
QBrush myBrush, undefinedBrush;
Index: kmail/snippet_widget.h
===================================================================
---- kmail/snippet_widget.h (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/snippet_widget.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/snippet_widget.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/snippet_widget.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -1,95 +0,0 @@
-/***************************************************************************
- * snippet feature from kdevelop/plugins/snippet/ *
@@ -447,8 +486,8 @@
-#endif
Index: kmail/snippet_widget.cpp
===================================================================
---- kmail/snippet_widget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/snippet_widget.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/snippet_widget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/snippet_widget.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -1,957 +0,0 @@
-/***************************************************************************
- * snippet feature from kdevelop/plugins/snippet/ *
@@ -1409,8 +1448,8 @@
-
Index: kmail/kmailicalifaceimpl.cpp
===================================================================
---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -1301,7 +1301,8 @@
// French
@@ -1424,8 +1463,8 @@
Index: kmail/encodingdetector.h
===================================================================
--- kmail/encodingdetector.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/encodingdetector.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
-@@ -0,0 +1,194 @@
++++ kmail/encodingdetector.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+@@ -0,0 +1,166 @@
+/*
+ This file was taken from the KDE 4.x libraries and backported to Qt 3.
+
@@ -1553,32 +1592,16 @@
+ EncodingChoiceSource encodingChoiceSource() const;
+
+ /**
-+ * The main class method
-+ *
-+ * Calls protected analyze() only the first time of the whole object life
-+ *
-+ * Replaces all null chars with spaces.
-+ */
-+ QString decode(const char *data, int len);
-+ QString decode(const QByteArray &data);
-+
-+ //* You don't need to call analyze() if you use this method.
-+ /**
-+ * Convenience method that uses buffering. It waits for full html head to be buffered
-+ * (i.e. calls analyze every time until it returns true).
-+ *
-+ * Replaces all null chars with spaces.
-+ *
-+ * @returns Decoded data, or empty string, if there was not enough data for accurate detection
-+ * @see flush()
++ * Analyze text data.
++ * @returns true if there was enough data for accurate detection
+ */
-+ QString decodeWithBuffering(const char *data, int len);
++ bool analyze( const char *data, int len );
+
+ /**
-+ * Convenience method to be used with decodeForHtml. Flushes buffer.
-+ * @see decodeForHtml()
++ * Analyze text data.
++ * @returns true if there was enough data for accurate detection
+ */
-+ QString flush();
++ bool analyze( const QByteArray &data );
+
+ /**
+ * Takes lang name _after_ it were i18n()'ed
@@ -1590,12 +1613,6 @@
+
+protected:
+ /**
-+ * This nice method will kill all 0 bytes (or double bytes)
-+ * and remember if this was a binary or not ;)
-+ */
-+ bool processNull(char* data,int length);
-+
-+ /**
+ * Check if we are really utf8. Taken from kate
+ *
+ * @returns true if current encoding is utf8 and the text cannot be in this encoding
@@ -1605,12 +1622,6 @@
+ bool errorsIfUtf8 (const char* data, int length);
+
+ /**
-+ * Analyze text data.
-+ * @returns true if there was enough data for accurate detection
-+ */
-+ bool analyze (const char *data, int len);
-+
-+ /**
+ * @returns QTextDecoder for detected encoding
+ */
+ QTextDecoder* decoder();
@@ -1620,10 +1631,24 @@
+};
+
+#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)
+@@ -627,9 +627,6 @@
+ /** Delete all body parts. */
+ void deleteBodyParts();
+
+- /** Removes the given body part. */
+- void removeBodyPart( DwBodyPart * dwPart );
+-
+ /** Set "Status" and "X-Status" fields of the message from the
+ * internal message status. */
+ void setStatusFields();
Index: kmail/newfolderdialog.cpp
===================================================================
---- kmail/newfolderdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/newfolderdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/newfolderdialog.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/newfolderdialog.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -148,7 +148,7 @@
}
if ( mFolder->folderType() == KMFolderTypeCachedImap ) {
@@ -1650,8 +1675,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 781012)
-+++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/kmreadermainwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmreadermainwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -496,6 +496,7 @@
f.setFamily( font );
mReaderWin->cssHelper()->setBodyFont( f );
@@ -1671,7 +1696,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 781012)
++++ kmail/encodingdetector_ja_p.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -0,0 +1,126 @@
+/*
+ * This file is part of the KDE libraries
@@ -1801,8 +1826,8 @@
+#endif /* GUESS_JA_H */
Index: kmail/Makefile.am
===================================================================
---- kmail/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/Makefile.am (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/Makefile.am (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -69,7 +69,8 @@
kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
@@ -1824,8 +1849,8 @@
snippetitem.cpp \
Index: kmail/kmreaderwin.cpp
===================================================================
---- kmail/kmreaderwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/kmreaderwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/kmreaderwin.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmreaderwin.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -764,10 +764,9 @@
void KMReaderWin::slotLevelQuote( int l )
{
@@ -1877,10 +1902,27 @@
void KMReaderWin::update( bool force )
{
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)
+@@ -3126,12 +3126,6 @@
+ mMsg->Body().DeleteBodyParts();
+ }
+
+-void KMMessage::removeBodyPart(DwBodyPart * dwPart)
+-{
+- mMsg->Body().RemoveBodyPart( dwPart );
+- mNeedsAssembly = true;
+-}
+-
+ //-----------------------------------------------------------------------------
+ DwBodyPart* KMMessage::createDWBodyPart(const KMMessagePart* aPart)
+ {
Index: kmail/snippetwidget.h
===================================================================
--- kmail/snippetwidget.h (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/snippetwidget.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
++++ kmail/snippetwidget.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -0,0 +1,95 @@
+/***************************************************************************
+ * snippet feature from kdevelop/plugins/snippet/ *
@@ -1979,8 +2021,8 @@
+#endif
Index: kmail/messageactions.cpp
===================================================================
---- kmail/messageactions.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/messageactions.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/messageactions.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/messageactions.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -70,7 +70,7 @@
this, SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" );
@@ -1990,10 +2032,122 @@
0, this, SLOT(slotCreateTodo()), mActionCollection,
"create_todo" );
+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)
+@@ -3369,7 +3369,29 @@
+ deleteLater();
+ }
+
++DwBodyPart * AttachmentModifyCommand::findPart(KMMessage* msg, int index)
++{
++ int accu = 0;
++ return findPartInternal( msg->getTopLevelPart(), index, accu );
++}
+
++DwBodyPart * AttachmentModifyCommand::findPartInternal(DwEntity * root, int index, int & accu)
++{
++ accu++;
++ if ( index < accu ) // should not happen
++ return 0;
++ DwBodyPart *current = dynamic_cast<DwBodyPart*>( root );
++ if ( index == accu )
++ return current;
++ DwBodyPart *rv = 0;
++ if ( root->Body().FirstBodyPart() )
++ rv = findPartInternal( root->Body().FirstBodyPart(), index, accu );
++ if ( !rv && current && current->Next() )
++ rv = findPartInternal( current->Next(), index, accu );
++ return rv;
++}
++
++
+ KMDeleteAttachmentCommand::KMDeleteAttachmentCommand(partNode * node, KMMessage * msg, QWidget * parent) :
+ AttachmentModifyCommand( node, msg, parent )
+ {
+@@ -3385,15 +3407,18 @@
+ {
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ if ( !dwpart )
+ return Failed;
+ KMMessage::bodyPart( dwpart, &part, true );
+ if ( !part.isComplete() )
+ return Failed;
+- msg->removeBodyPart( dwpart );
+
++ DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
++ if ( !parentNode )
++ return Failed;
++ parentNode->RemoveBodyPart( dwpart );
++
+ // add dummy part to show that a attachment has been deleted
+ KMMessagePart dummyPart;
+ dummyPart.duplicate( part );
+@@ -3409,7 +3434,9 @@
+ } else if ( cd.isEmpty() ) {
+ dummyPart.setContentDisposition( "attachment" );
+ }
+- msg->addBodyPart( &dummyPart );
++ DwBodyPart* newDwPart = msg->createDWBodyPart( &dummyPart );
++ parentNode->AddBodyPart( newDwPart );
++ msg->getTopLevelPart()->Assemble();
+
+ KMMessage *newMsg = new KMMessage();
+ newMsg->fromDwString( msg->asDwString() );
+@@ -3435,14 +3462,16 @@
+ {
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ if ( !dwpart )
+ return Failed;
+ KMMessage::bodyPart( dwpart, &part, true );
+ if ( !part.isComplete() )
+ return Failed;
+
++ if( !dynamic_cast<DwBody*>( dwpart->Parent() ) )
++ return Failed;
++
+ mTempFile.file()->writeBlock( part.bodyDecodedBinary() );
+ mTempFile.file()->flush();
+
+@@ -3472,16 +3501,21 @@
+ // build the new message
+ KMMessage *msg = retrievedMessage();
+ KMMessagePart part;
+- // -2 because partNode counts root and body of the message as well
+- DwBodyPart *dwpart = msg->dwBodyPart( mPartIndex - 2 );
++ DwBodyPart *dwpart = findPart( msg, mPartIndex );
+ KMMessage::bodyPart( dwpart, &part, true );
+- msg->removeBodyPart( dwpart );
+
++ DwBody *parentNode = dynamic_cast<DwBody*>( dwpart->Parent() );
++ assert( parentNode );
++ parentNode->RemoveBodyPart( dwpart );
++
+ KMMessagePart att;
+ att.duplicate( part );
+ att.setBodyEncodedBinary( data );
+- msg->addBodyPart( &att );
+
++ DwBodyPart* newDwPart = msg->createDWBodyPart( &att );
++ parentNode->AddBodyPart( newDwPart );
++ msg->getTopLevelPart()->Assemble();
++
+ KMMessage *newMsg = new KMMessage();
+ newMsg->fromDwString( msg->asDwString() );
+ newMsg->setStatus( msg->status() );
Index: kmail/headerstyle.cpp
===================================================================
---- kmail/headerstyle.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/headerstyle.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/headerstyle.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/headerstyle.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -894,7 +894,7 @@
// kmail icon
if(topLevel) {
@@ -2005,8 +2159,8 @@
Index: kmail/composercryptoconfiguration.ui
===================================================================
---- kmail/composercryptoconfiguration.ui (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/composercryptoconfiguration.ui (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/composercryptoconfiguration.ui (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/composercryptoconfiguration.ui (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -56,7 +56,7 @@
<cstring>mEncToSelf</cstring>
</property>
@@ -2018,8 +2172,8 @@
<string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string>
Index: kmail/kmmainwidget.cpp
===================================================================
---- kmail/kmmainwidget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/kmmainwidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/kmmainwidget.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmmainwidget.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -152,6 +152,7 @@
mQuickSearchLine( 0 ),
mShowBusySplashTimer( 0 ),
@@ -2041,7 +2195,7 @@
Index: kmail/encodingdetector_ja.cpp
===================================================================
--- kmail/encodingdetector_ja.cpp (.../tags/KDE/3.5.9/kdepim) (wersja 0)
-+++ kmail/encodingdetector_ja.cpp (.../branches/KDE/3.5/kdepim) (wersja 781012)
++++ kmail/encodingdetector_ja.cpp (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -0,0 +1,376 @@
+/*
+ * This file is part of the KDE libraries
@@ -2421,8 +2575,8 @@
+}
Index: kmail/kmcomposewin.h
===================================================================
---- kmail/kmcomposewin.h (.../tags/KDE/3.5.9/kdepim) (wersja 781012)
-+++ kmail/kmcomposewin.h (.../branches/KDE/3.5/kdepim) (wersja 781012)
+--- kmail/kmcomposewin.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmcomposewin.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
@@ -348,7 +348,7 @@
/**
* Read settings from app's config file.
@@ -2432,10 +2586,39 @@
/**
* Change window title to given string.
*/
+Index: kmail/kmcommands.h
+===================================================================
+--- kmail/kmcommands.h (.../tags/KDE/3.5.9/kdepim) (wersja 784383)
++++ kmail/kmcommands.h (.../branches/KDE/3.5/kdepim) (wersja 784383)
+@@ -32,6 +32,8 @@
+ class KMMsgBase;
+ class KMReaderWin;
+ class partNode;
++class DwBodyPart;
++class DwEntity;
+ namespace KIO { class Job; }
+ namespace KMail {
+ class Composer;
+@@ -1038,6 +1040,7 @@
+
+ protected:
+ void storeChangedMessage( KMMessage* msg );
++ DwBodyPart* findPart( KMMessage* msg, int index );
+ virtual Result doAttachmentModify() = 0;
+
+ protected:
+@@ -1046,6 +1049,7 @@
+
+ private:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdepim-branch.diff?r1=1.58&r2=1.59&f=u
More information about the pld-cvs-commit
mailing list