SOURCES: kdelibs-branch.diff - fix for http regression bugs htt...
arekm
arekm at pld-linux.org
Wed Oct 17 13:46:12 CEST 2007
Author: arekm Date: Wed Oct 17 11:46:12 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix for http regression bugs
http://bugs.kde.org/show_bug.cgi?id=150809 (ssl bolt icon)
http://bugs.kde.org/show_bug.cgi?id=150904 (PHP cgi)
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.62 -> 1.63)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.62 SOURCES/kdelibs-branch.diff:1.63
--- SOURCES/kdelibs-branch.diff:1.62 Wed Aug 15 18:37:11 2007
+++ SOURCES/kdelibs-branch.diff Wed Oct 17 13:46:07 2007
@@ -1,4333 +1,538 @@
-Index: libkscreensaver/main.cpp
+Index: mimetypes/application/x-tex-pk.desktop
===================================================================
---- libkscreensaver/main.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ libkscreensaver/main.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -113,6 +113,7 @@
- if (args->isSet("setup"))
- {
- QDialog *dlg = kss_setup();
-+ args->clear();
- dlg->exec();
- delete dlg;
- exit(0);
-@@ -151,12 +152,11 @@
- demoWidget->setFixedSize( 600, 420 );
- demoWidget->show();
- }
--
-+ args->clear();
- app.exec();
-
- delete target;
-- if ( demoWidget )
-- delete demoWidget;
-+ delete demoWidget;
-
- return 0;
- }
-Index: interfaces/kscript/scriptmanager.cpp
-===================================================================
---- interfaces/kscript/scriptmanager.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ interfaces/kscript/scriptmanager.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
+--- mimetypes/application/x-tex-pk.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-tex-pk.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
@@ -17,7 +17,7 @@
- QString scriptFile;
- QString scriptMethod;
- ScriptInfo();
-- ~ScriptInfo(){};
-+ ~ScriptInfo(){}
- };
- ScriptInfo::ScriptInfo()
- {
-Index: interfaces/kscript/scriptinterface.desktop
-===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -48,7 +48,7 @@
- Comment[mt]=Magna ġenerika biex tittestja l-interfaċċja tal-iskritti
- Comment[nb]=Dette er et generisk testskript for å teste skriptgrensesnitt.
- Comment[nds]=Dit is en allgemeen Koppel vun Testskripten för dat Pröven vun de Skript-Koppelsteed.
--Comment[ne]=स्क्रिप्ट इन्टरफेस परिक्षणका लागि यो एउटा जेनेरिक परिक्षण स्क्रिप्ट हो ।
-+Comment[ne]=स्क्रिप्ट इन्टरफेस परीक्षणका लागि यो एउटा जेनेरिक परीक्षण स्क्रिप्ट हो ।
- Comment[nl]= Dit is een algemene verzameling van testroutines voor het testen dan de script-interface.
- Comment[nn]=Dette er ein generell testskriptmotor for å prøva ut skriptgrensesnittet.
- Comment[nso]=Ye ke engine ya thswaelo ya teko ya kakaretso yeo e somiswago go leka sefahlego sa tshwaelo.
-Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
+ Comment[de]=Schriftpaket
+ Comment[el]=Packed γραμματοσειρά
+ Comment[eo]=Pakita tipardosiero
+-Comment[es]=Fuente empaquetada
++Comment[es]=Tipo de letra empaquetado
+ Comment[et]=Pakitud fondifail
+ Comment[eu]=Letra-tipo paketatua
+ Comment[fa]=قلم بستهای
+Index: mimetypes/application/x-font-speedo.desktop
+===================================================================
+--- mimetypes/application/x-font-speedo.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-speedo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=Speedo-Schriftart
+ Comment[el]=Γραμματοσειρά Speedo
+ Comment[eo]=Speedo-Tiparo
+-Comment[es]=Fuente Speedo
++Comment[es]=Tipo de letra Speedo
+ Comment[et]=Speedo font
+ Comment[eu]=Speedo-ren letra-tipoa
+ Comment[fa]=قلم Speedo
+Index: mimetypes/application/x-font-ghostscript.desktop
+===================================================================
+--- mimetypes/application/x-font-ghostscript.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-ghostscript.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=Ghostscript-Schrift
+ Comment[el]=Έγγραφο Ghostscript
+ Comment[eo]=Postskripta tiparo
+-Comment[es]=Fuente Ghostscript
++Comment[es]=Tipo de letra Ghostscript
+ Comment[et]=Ghostscripti font
+ Comment[eu]=Ghostscript-en letra-tipoa
+ Comment[fa]=قلم Ghostscript
+Index: mimetypes/application/x-font-otf.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -69,7 +69,7 @@
- Comment[cy]=Mae'r negesydd chwim yn caniatàu sgwrs dwy-ffordd rhwng unigolion a grwpiau.
- Comment[da]=Instant messenger tillader tovejs chat mellem individer og grupper.
- Comment[de]=Der Instant Messenger ermöglicht Chats zwischen Personen und Gruppen in jede Richtung.
--Comment[el]=Ο στιγμιαίος αποστολέας επιτρέπει τη συζήτηση μεταξύ άτομα και ομάδες.
-+Comment[el]=Ο στιγμιαίος αποστολέας επιτρέπει τη συζήτηση μεταξύ ατόμων και ομάδων.
- Comment[eo]=La tujmesaĝilo ebligas ambaŭdirekta parolado inter homoj kaj grupoj
- Comment[es]=El Instant Messenger permite conversación en dos sentidos entre indivíduos y grupos.
- Comment[et]=Kiirsuhtlus võimaldab üksikisikute ja gruppide kahepoolset vestlust.
-Index: interfaces/kspeech/dcoptexttospeech.desktop
-===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ interfaces/kspeech/dcoptexttospeech.desktop (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -61,6 +61,7 @@
- Comment[te]=డికాప్ ఇంటర్ఫేస్ కల్గిన వాచకం నుంచి మాటలకు మార్చు సేవ
- Comment[tg]=Хизматгузории Мант-ба-Талаффуз бо интерфейси DCOP
- Comment[th]=บริการเปลี่ยนข้อความเป็นเสียงพูด พร้อมด้วยส่วนติดต่อกับ DCOP
-+Comment[tr]=DCOP arayüzü ile Metinden Ses Servisi
- Comment[tt]=DCOP protokolı aşa eşläwçe Mäten-Uquçı Xezmät
- Comment[uk]=Служба синтезу мовлення з інтерфейсом DCOP
- Comment[vi]=Dịch vụ Văn bản sang Tiếng nói có giao diện DCOP
-Index: interfaces/ktexteditor/selectioninterfaceext.cpp
+--- mimetypes/application/x-font-otf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-otf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -17,7 +17,7 @@
+ Comment[de]=OpenType-Schrift
+ Comment[el]=Γραμματοσειρά OpenType
+ Comment[eo]=OpenType-Tiparo
+-Comment[es]=Fuente OpenType
++Comment[es]=Tipo de letra OpenType
+ Comment[et]=OpenType'i font
+ Comment[eu]=OpenType-en letra-tipoa
+ Comment[fa]=قلم نوع باز
+Index: mimetypes/application/x-font-pcf.desktop
+===================================================================
+--- mimetypes/application/x-font-pcf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-pcf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=PCF-Bitmap-Schrift
+ Comment[el]=Γραμματοσειρά PCF bitmap
+ Comment[eo]=PCF-bitmapa tiparo
+-Comment[es]=Fuente bitmap PCF
++Comment[es]=Tipo de letra bitmap PCF
+ Comment[et]=PCF bittrasterfont
+ Comment[eu]=PCF bitmap-en letra-tipoa
+ Comment[fa]=قلم نگاشت بیت PCF
+Index: mimetypes/application/x-font-snf.desktop
+===================================================================
+--- mimetypes/application/x-font-snf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-snf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=SNF-Bitmap-Schrift
+ Comment[el]=Γραμματοσειρά SNF bitmap
+ Comment[eo]=SNF-bitmapa tiparo
+-Comment[es]=Fuente bitmap SNF
++Comment[es]=Tipo de letra bitmap SNF
+ Comment[et]=SNF bittrasterfont
+ Comment[eu]=SNF bitmap-en letra-tipoa
+ Comment[fa]=قلم نگاشت بیت SNF
+Index: mimetypes/application/x-font-ttc.desktop
===================================================================
---- interfaces/ktexteditor/selectioninterfaceext.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ interfaces/ktexteditor/selectioninterfaceext.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -30,8 +30,8 @@
- //BEGIN KTextEditor::SelectionInterfaceExt
- class KTextEditor::PrivateSelectionInterfaceExt {
- public:
-- PrivateSelectionInterfaceExt() : interface( 0 ) {};
-- ~PrivateSelectionInterfaceExt() {};
-+ PrivateSelectionInterfaceExt() : interface( 0 ) {}
-+ ~PrivateSelectionInterfaceExt() {}
-
- SelectionExtDCOPInterface *interface;
- };
-Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
+--- mimetypes/application/x-font-ttc.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-ttc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -17,7 +17,7 @@
+ Comment[de]=TrueType-Schriftensammlung
+ Comment[el]=Συλλογή γραμματοσειρών TrueType
+ Comment[eo]=TrueType-Tiparkolekto
+-Comment[es]=Colección de fuentes TrueType
++Comment[es]=Colección de tipos de letra TrueType
+ Comment[et]=TrueType fondikogu
+ Comment[eu]=TrueType letra-tipoen bilduma
+ Comment[fa]=مجموعۀ قلم حقیقی
+Index: mimetypes/application/x-font-ttf.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -102,7 +102,7 @@
- Comment[ms]=Tetapkan penanda buku pada baris yang padan dengan paten apabila dokumen dimuatkan
- Comment[nb]=Bestem bokmerke på linjer som passer til et mønster når dokument blir åpnet
- Comment[nds]=Sett al bi't Laden Leestekens för Regen, op de en Muster passt
--Comment[ne]=कागजात लोड हुँदा बान्की मिल्दो पुस्तकचिनोहरू लाइनमा सेट गर्नुहोस्
-+Comment[ne]=कागजात लोड हुँदा बाँन्की मिल्दो पुस्तकचिनोहरू लाइनमा सेट गर्नुहोस्
- Comment[nl]=Plaatsen van bladwijzers op regels die voldoen aan een bepaald patroon zodra het document geopend wordt
- Comment[nn]=Set bokmerke på linjer som passar til eit mønster når dokument vert opna
- Comment[pa]=ਜਦੋਂ ਵੀ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਬੁੱਕਮਾਰਕ ਨੂੰ ਸਤਰ-ਮੇਲ ਤਰਤੀਬ ਨਿਰਧਾਰਿਤ ਕਰੋ
-Index: kate/plugins/isearch/ISearchPlugin.cpp
+--- mimetypes/application/x-font-ttf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-ttf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -17,7 +17,7 @@
+ Comment[de]=TrueType-Schrift
+ Comment[el]=Γραμματοσειρά TrueType
+ Comment[eo]=TrueType-Tiparo
+-Comment[es]=Fuente TrueType
++Comment[es]=Tipo de letra TrueType
+ Comment[et]=TrueType font
+ Comment[eu]=TrueType letra-tipoa
+ Comment[fa]=قلم حقیقی
+Index: mimetypes/application/x-afm.desktop
===================================================================
---- kate/plugins/isearch/ISearchPlugin.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/plugins/isearch/ISearchPlugin.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -382,14 +382,9 @@
- {
- if( !text.isNull() && !text.isEmpty() ) {
- m_combo->addToHistory( text );
-- m_combo->insertItem( text );
- m_lastString = text;
- }
-
-- m_combo->blockSignals( true );
-- m_combo->clear();
-- m_combo->blockSignals( false );
--
- if( m_view ) {
- m_view->setFocus(); // Will call endSearch()
- }
-Index: kate/part/katerenderer.cpp
+--- mimetypes/application/x-afm.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-afm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -16,7 +16,7 @@
+ Comment[de]=Metrische Informationen für PostScript-Schrift
+ Comment[el]=Μετρικά γραμματοσειράς PostScript
+ Comment[eo]=Postskripto-1-Tiparo
+-Comment[es]=Métrica de fuentes Postscript.
++Comment[es]=Métrica de tipo de letra Postscript.
+ Comment[et]=PostScript fondimeetrika (PFM)
+ Comment[eu]=PostScript letra-tipoen metrika
+ Comment[fa]=اندازۀ قلم پستاسکریپت
+Index: mimetypes/application/x-tex-gf.desktop
===================================================================
---- kate/part/katerenderer.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/part/katerenderer.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -798,6 +798,11 @@
- Q_ASSERT(width);
- x += width;
-
-+ // How should tabs be treated when they word-wrap on a print-out?
-+ // if startcol != 0, this messes up (then again, word wrapping messes up anyway)
-+ if (unicode[z] == QChar('\t'))
-+ x -= x % width;
-+
- if (unicode[z].isSpace())
- {
- lastWhiteSpace = z+1;
-@@ -816,11 +821,6 @@
- }
+--- mimetypes/application/x-tex-gf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-tex-gf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -17,7 +17,7 @@
+ Comment[de]=Generische Schrift
+ Comment[el]=Γενική γραμματοσειρά
+ Comment[eo]=Genera tipardosiero
+-Comment[es]=Fuente genérica
++Comment[es]=Tipo de letra genérico
+ Comment[et]=Üldine fondifail
+ Comment[eu]=Letra-tipo generikoa
+ Comment[fa]=قلم عمومی
+Index: mimetypes/application/x-font-bdf.desktop
+===================================================================
+--- mimetypes/application/x-font-bdf.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-bdf.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=BDF-Bitmap-Schrift
+ Comment[el]=Γραμματοσειρά BDF bitmap
+ Comment[eo]=BDF-bitmapa tiparo
+-Comment[es]=Fuente bitmap BDF
++Comment[es]=Tipo de letra bitmap BDF
+ Comment[et]=BDF bittrasterfont
+ Comment[eu]=BDF bitmap letra-tipoa
+ Comment[fa]=قلم نگاشت بیت BDF
+Index: mimetypes/application/x-font-type1.desktop
+===================================================================
+--- mimetypes/application/x-font-type1.desktop (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ mimetypes/application/x-font-type1.desktop (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -21,7 +21,7 @@
+ Comment[de]=Type1-Schrift
+ Comment[el]=Γραμματοσειρά PostScript Type1
+ Comment[eo]=Postskripto-1-Tiparo
+-Comment[es]=Fuente Postscript Tipo1
++Comment[es]=Tipo de letra Postscript tipo 1
+ Comment[et]=PostScript Type1 font
+ Comment[eu]=PostScript Type1 letra-tipoa
+ Comment[fa]=قلم نوع ۱ پستاسکریپت
+Index: kioslave/http/kcookiejar/kcookiejar.cpp
+===================================================================
+--- kioslave/http/kcookiejar/kcookiejar.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ kioslave/http/kcookiejar/kcookiejar.cpp (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -991,7 +991,7 @@
+ #ifdef MAX_COOKIE_LIMIT
+ if (cookieList->count() >= MAX_COOKIES_PER_HOST)
+ makeRoom(cookieList, cookiePtr); // Delete a cookie
+-#endif
++#endif
+ cookieList->inSort( cookiePtr );
+ m_cookiesChanged = true;
}
+@@ -1016,7 +1016,7 @@
+ extractDomains(cookiePtr->host(), domains);
-- // How should tabs be treated when they word-wrap on a print-out?
-- // if startcol != 0, this messes up (then again, word wrapping messes up anyway)
-- if (unicode[z] == QChar('\t'))
-- x -= x % width;
--
- if (x <= maxwidth)
+ // If the cookie specifies a domain, check whether it is valid. Otherwise,
+- // accept the cookie anyways but removes the domain="" value to prevent
++ // accept the cookie anyways but remove the domain="" value to prevent
+ // cross-site cookie injection.
+ if (!cookiePtr->domain().isEmpty())
{
- if (lastWhiteSpace > -1)
-Index: kate/part/katedocument.h
-===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -373,7 +373,9 @@
- // these two variables are for resetting the document to
- // non-modified if all changes have been undone...
- KateUndoGroup* lastUndoGroupWhenSaved;
-+ KateUndoGroup* lastRedoGroupWhenSaved;
- bool docWasSavedWhenUndoWasEmpty;
-+ bool docWasSavedWhenRedoWasEmpty;
-
- // this sets
- void updateModified();
-Index: kate/part/kateview.cpp
+Index: kioslave/http/http.cc
===================================================================
---- kate/part/kateview.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -1521,32 +1521,32 @@
- // We have to tag the whole lot if
- // 1) we have a selection, and:
- // a) it's new; or
-- tagLines(selectStart, selectEnd);
-+ tagLines(selectStart, selectEnd, true);
-
- } else if (blockSelectionMode() && (oldSelectStart.col() != selectStart.col() || oldSelectEnd.col() != selectEnd.col())) {
- // b) we're in block selection mode and the columns have changed
-- tagLines(selectStart, selectEnd);
-- tagLines(oldSelectStart, oldSelectEnd);
-+ tagLines(selectStart, selectEnd, true);
-+ tagLines(oldSelectStart, oldSelectEnd, true);
-
- } else {
- if (oldSelectStart != selectStart) {
- if (oldSelectStart < selectStart)
-- tagLines(oldSelectStart, selectStart);
-+ tagLines(oldSelectStart, selectStart, true);
- else
-- tagLines(selectStart, oldSelectStart);
-+ tagLines(selectStart, oldSelectStart, true);
- }
-
- if (oldSelectEnd != selectEnd) {
- if (oldSelectEnd < selectEnd)
-- tagLines(oldSelectEnd, selectEnd);
-+ tagLines(oldSelectEnd, selectEnd, true);
- else
-- tagLines(selectEnd, oldSelectEnd);
-+ tagLines(selectEnd, oldSelectEnd, true);
- }
- }
-
- } else {
- // No more selection, clean up
-- tagLines(oldSelectStart, oldSelectEnd);
-+ tagLines(oldSelectStart, oldSelectEnd, true);
+--- kioslave/http/http.cc (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ kioslave/http/http.cc (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -3409,10 +3409,6 @@
+
+ } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
+
+- // Send the current response before processing starts or it
+- // might never get sent...
+- forwardHttpResponseHeader();
+-
+ // Now process the HTTP/1.1 upgrade
+ QStringList::Iterator opt = upgradeOffers.begin();
+ for( ; opt != upgradeOffers.end(); ++opt) {
+@@ -3818,6 +3814,10 @@
+ mimeType( m_strMimeType );
}
- }
-Index: kate/part/katedocument.cpp
++ // Do not move send response header before any redirection as it seems
++ // to screw up some sites. See BR# 150904.
++ forwardHttpResponseHeader();
++
+ if (m_request.method == HTTP_HEAD)
+ return true;
+
+@@ -3830,10 +3830,10 @@
+ // Check...
+ createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
+ if (!m_request.fcache)
+- {
+- m_request.bCachedWrite = false; // Error creating cache entry.
+- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
+- }
++ {
++ m_request.bCachedWrite = false; // Error creating cache entry.
++ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
++ }
+ m_request.expireDate = expireDate;
+ m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
+ }
+Index: kio/kio/kservice.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -98,7 +98,9 @@
- m_undoDontMerge(false),
- m_undoIgnoreCancel(false),
- lastUndoGroupWhenSaved( 0 ),
-+ lastRedoGroupWhenSaved( 0 ),
- docWasSavedWhenUndoWasEmpty( true ),
-+ docWasSavedWhenRedoWasEmpty( true ),
- m_modOnHd (false),
- m_modOnHdReason (0),
- m_job (0),
-@@ -1546,14 +1548,74 @@
-
- void KateDocument::updateModified()
- {
-- if ( ( lastUndoGroupWhenSaved &&
-- !undoItems.isEmpty() &&
-- undoItems.last() == lastUndoGroupWhenSaved )
-- || ( undoItems.isEmpty() && docWasSavedWhenUndoWasEmpty ) )
-+ /*
-+ How this works:
-+
-+ After noticing that there where to many scenarios to take into
-+ consideration when using 'if's to toggle the "Modified" flag
-+ I came up with this baby, flexible and repetitive calls are
-+ minimal.
-+
-+ A numeric unique pattern is generated by toggleing a set of bits,
-+ each bit symbolizes a different state in the Undo Redo structure.
-+
-+ undoItems.isEmpty() != null BIT 1
-+ redoItems.isEmpty() != null BIT 2
-+ docWasSavedWhenUndoWasEmpty == true BIT 3
-+ docWasSavedWhenRedoWasEmpty == true BIT 4
-+ lastUndoGroupWhenSavedIsLastUndo BIT 5
-+ lastUndoGroupWhenSavedIsLastRedo BIT 6
-+ lastRedoGroupWhenSavedIsLastUndo BIT 7
-+ lastRedoGroupWhenSavedIsLastRedo BIT 8
-+
-+ If you find a new pattern, please add it to the patterns array
-+ */
-+
-+ unsigned char currentPattern = 0;
-+ const unsigned char patterns[] = {5,16,24,26,88,90,93,133,144,149,165};
-+ const unsigned char patternCount = sizeof(patterns);
-+ KateUndoGroup* undoLast = 0;
-+ KateUndoGroup* redoLast = 0;
-+
-+ if (undoItems.isEmpty())
+--- kio/kio/kservice.cpp (.../tags/KDE/3.5.8/kdelibs) (wersja 726267)
++++ kio/kio/kservice.cpp (.../branches/KDE/3.5/kdelibs) (wersja 726267)
+@@ -109,6 +109,7 @@
+ entryMap.remove("Hidden");
+ if (m_bDeleted)
{
-- setModified( false );
-- kdDebug(13020) << k_funcinfo << "setting modified to false!" << endl;
-- };
-+ currentPattern |= 1;
-+ }
-+ else
-+ {
-+ undoLast = undoItems.last();
-+ }
-+
-+ if (redoItems.isEmpty())
-+ {
-+ currentPattern |= 2;
-+ }
-+ else
-+ {
-+ redoLast = redoItems.last();
-+ }
-+
-+ if (docWasSavedWhenUndoWasEmpty) currentPattern |= 4;
-+ if (docWasSavedWhenRedoWasEmpty) currentPattern |= 8;
-+ if (lastUndoGroupWhenSaved == undoLast) currentPattern |= 16;
-+ if (lastUndoGroupWhenSaved == redoLast) currentPattern |= 32;
-+ if (lastRedoGroupWhenSaved == undoLast) currentPattern |= 64;
-+ if (lastRedoGroupWhenSaved == redoLast) currentPattern |= 128;
-+
-+ // This will print out the pattern information
-+
-+ kdDebug(13020) << k_funcinfo
-+ << "Pattern:" << static_cast<unsigned int>(currentPattern) << endl;
-+
-+ for (uint patternIndex = 0; patternIndex < patternCount; ++patternIndex)
-+ {
-+ if ( currentPattern == patterns[patternIndex] )
-+ {
-+ setModified( false );
-+ kdDebug(13020) << k_funcinfo << "setting modified to false!" << endl;
-+ break;
-+ }
-+ }
- }
-
- void KateDocument::clearUndo()
-@@ -1574,6 +1636,9 @@
- redoItems.clear ();
- redoItems.setAutoDelete (false);
-
-+ lastRedoGroupWhenSaved = 0;
-+ docWasSavedWhenRedoWasEmpty = false;
-+
- emit undoChanged ();
- }
-
-@@ -2780,12 +2845,21 @@
- emit modifiedChanged ();
- emit modStateChanged ((Kate::Document *)this);
++ //kdDebug() << "Hidden=true for " << entryPath() << endl;
+ m_bValid = false;
+ return;
}
-- if ( m == false && ! undoItems.isEmpty() )
-+ if ( m == false )
+@@ -119,6 +120,8 @@
{
-- lastUndoGroupWhenSaved = undoItems.last();
-+ if ( ! undoItems.isEmpty() )
-+ {
-+ lastUndoGroupWhenSaved = undoItems.last();
-+ }
-+
-+ if ( ! redoItems.isEmpty() )
-+ {
-+ lastRedoGroupWhenSaved = redoItems.last();
-+ }
-+
-+ docWasSavedWhenUndoWasEmpty = undoItems.isEmpty();
-+ docWasSavedWhenRedoWasEmpty = redoItems.isEmpty();
- }
--
-- if ( m == false ) docWasSavedWhenUndoWasEmpty = undoItems.isEmpty();
- }
- //END
-
-@@ -4373,7 +4447,7 @@
-
- m_reloading = false;
-
-- for (uint z=0; z < tmp.size(); z++)
-+ for ( QValueList<int>::size_type z=0; z < tmp.size(); z++ )
- {
- if (z < numLines())
- {
-@@ -4577,7 +4651,7 @@
- QString nameOfFile = url().fileName();
-
- bool found = false;
-- for (int i = 0; !found && i < wildcards.size(); ++i)
-+ for (QStringList::size_type i = 0; !found && i < wildcards.size(); ++i)
+ if (config->readEntry( "Exec" ).isEmpty())
{
- QRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*QRegExp::Wildcard*/);
-
-Index: kate/part/kateviewinternal.cpp
-===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.7/kdelibs) (wersja 700476)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs) (wersja 700476)
-@@ -1653,7 +1653,22 @@
-
- if (maxX && range.wrap) {
- QChar lastCharInLine = textLine(range.line)->getChar(range.endCol - 1);
-- maxX -= m_view->renderer()->config()->fontMetrics()->width(lastCharInLine);
-+
-+ if (lastCharInLine == QChar('\t')) {
-+ int lineSize = 0;
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.62&r2=1.63&f=u
More information about the pld-cvs-commit
mailing list