packages: kde4-kdelibs/kde4-kdelibs-branch.diff, kde4-kdelibs/kde4-kdelibs....
arekm
arekm at pld-linux.org
Wed Sep 1 14:52:27 CEST 2010
Author: arekm Date: Wed Sep 1 12:52:27 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; branch diff is back
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-branch.diff (1.20 -> 1.21) , kde4-kdelibs.spec (1.208 -> 1.209)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branch.diff
diff -u packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.20 packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.21
--- packages/kde4-kdelibs/kde4-kdelibs-branch.diff:1.20 Thu Aug 19 19:11:13 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branch.diff Wed Sep 1 14:52:22 2010
@@ -1,2755 +1,997 @@
-Index: ConfigureChecks.cmake
+Index: kate/syntax/data/latex.xml
===================================================================
---- ConfigureChecks.cmake (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ ConfigureChecks.cmake (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -34,6 +34,8 @@
-
- macro_bool_to_01(LIBINTL_FOUND ENABLE_NLS) # kdecore, khtml, kjs
-
-+macro_bool_to_01(DBUSMENUQT_FOUND HAVE_DBUSMENUQT) # kdeui
+--- kate/syntax/data/latex.xml (.../tags/KDE/4.5.1/kdelibs) (wersja 1170564)
++++ kate/syntax/data/latex.xml (.../branches/KDE/4.5/kdelibs) (wersja 1170564)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="LaTeX" version="1.41" section="Markup" kateversion="2.3" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)+Holger Danielsson (holger.danielsson at versanet.de)+Michel Ludwig (michel.ludwig at kdemail.net)+Thomas Braun (thomas.braun at virtuell-zuhause.de)" license="LGPL" >
++<language name="LaTeX" version="1.42" section="Markup" kateversion="2.3" priority="10" extensions="*.tex;*.ltx;*.dtx;*.sty;*.cls;*.bbx;*.cbx;*.lbx;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout at kdemail.net)+Holger Danielsson (holger.danielsson at versanet.de)+Michel Ludwig (michel.ludwig at kdemail.net)+Thomas Braun (thomas.braun at virtuell-zuhause.de)" license="LGPL" >
+ <highlighting>
+ <contexts>
+ <!-- Normal text -->
+@@ -281,9 +281,8 @@
+
+ <!-- parse math environment -->
+ <context name="MathModeEnv" attribute="Math" lineEndContext="#stay">
+- <RegExpr String="\\end(?=\s*\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat)\*?\})" attribute="Structure" context="MathFindEnd"/>
+- <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
+- <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
++ <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindBeginEnvironment" beginRegion="block"/>
++ <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="MathFindEnd"/>
+ <StringDetect String="\(" attribute="Error" context="#stay" />
+ <StringDetect String="\[" attribute="Error" context="#stay" />
+ <StringDetect String="\)" attribute="Error" context="#stay" />
+@@ -371,8 +370,8 @@
+ <!-- math mode common -->
+ <context name="MathModeCommon" attribute="Math" lineEndContext="#stay">
+ <RegExpr String="\\(begin|end)\s*\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign|alignat|xalignat|xxalignat)\*?\}" attribute="Error" context="#stay"/>
+- <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
+- <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
++ <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" beginRegion="block" />
++ <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Keyword Mathmode" context="#stay" endRegion="block" />
+ <RegExpr String="\\(text|intertext|mbox)\s*(?=\{)" attribute="Keyword Mathmode" context="MathModeText" />
+ <DetectChar char="\" attribute="Keyword Mathmode" context="MathContrSeq"/>
+ <DetectChar char="%" attribute="Comment" context="Comment"/>
+@@ -443,7 +442,7 @@
+ <itemData name="Structure Keyword" defStyleNum="dsNormal" color="#800000" selColor="#60FFFF" bold="1" italic="0" spellChecking="false"/>
+ <itemData name="Structure Math" defStyleNum="dsNormal" color="#00A000" selColor="#FF40FF" bold="1" italic="0"/>
+ <itemData name="Structure Keyword Mathmode" defStyleNum="dsNormal" color="#606000" selColor="#FFD0FF" bold="1" italic="0" spellChecking="false"/>
+- </itemDatas>
++ </itemDatas>
+ </highlighting>
+
+ <general>
+Index: kate/spellcheck/ontheflycheck.cpp
+===================================================================
+--- kate/spellcheck/ontheflycheck.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1170564)
++++ kate/spellcheck/ontheflycheck.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1170564)
+@@ -60,6 +60,10 @@
+ this, SLOT(updateConfig()));
+ connect(document, SIGNAL(respellCheckBlock(KateDocument*, int, int)),
+ this, SLOT(handleRespellCheckBlock(KateDocument*, int, int)));
+
- # FIXME: Make this changeable!
- # khtml svg support
- set(SVG_SUPPORT 1) # unused yet, but for the future
-Index: kate/data/katemoderc
-===================================================================
---- kate/data/katemoderc (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kate/data/katemoderc (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -1,5 +1,5 @@
- [Python]
--Variables=kate: presave-postdialog python-encoding; indent-mode python;
-+Variables=kate: indent-mode python;
-
- [Makefile]
- Variables=kate: tab-width 8; indent-width 8; replace-tabs off; replace-tabs-save off;
-Index: kate/plugins/autobrace/ktexteditor_autobrace_config.desktop
-===================================================================
---- kate/plugins/autobrace/ktexteditor_autobrace_config.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kate/plugins/autobrace/ktexteditor_autobrace_config.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -14,6 +14,7 @@
- Name[en_GB]=AutoBrace Configuration
- Name[es]=Configuración de los paréntesis automáticos
- Name[et]=Automaatsete sulgude seadistamine
-+Name[eu]=Parentesi automatikoen konfiguraketa
- Name[fr]=Configuration des accolades automatiques
- Name[fy]=Ynstellings for automatyske heakjes
- Name[ga]=Cumraíocht AutoBrace
-Index: kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop
-===================================================================
---- kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kate/plugins/kte_insanehtml_le/data/ktexteditor_insanehtml_le.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -22,6 +22,7 @@
- Name[en_GB]=Insane (not ZEN) HTML coding (light edition)
- Name[es]=Codificación HTML insensata (no zen) (edición ligera)
- Name[et]=Hullumeelne (mitte ZEN) HTML kodeering (kerge versioon)
-+Name[eu]=HTML kodeketa zentzugabea (ez ZEN) (edizio arina)
- Name[fr]=Codage HTML démentiel (non ZEN, édition simple)
- Name[fy]=Insane (net ZEN) HTML kode sjen (lighte edysje)
- Name[ga]=Códú HTML Insane (seachas ZEN) (leagan éadrom)
-@@ -58,6 +59,7 @@
- Comment[en_GB]=A plugin, which does zen-coding like selector completion
- Comment[es]=Un complemento que realiza codificación zen, como el selector de terminación
- Comment[et]=Plugin, mis kasutab zen-kodeerimise laadset selektori lõpetamist
-+Comment[eu]=Plugin bat, zen kodeketa egiten duena, osaketa hautaketa bezala
- Comment[fr]=Un module permettant un codage zen grâce à l'auto-complètement
- Comment[fy]=In plugyn, dy't zen-kodearring docht lykas kar-foltôging
- Comment[ga]=Breiseán a dhéanann códú zen mar shampla comhlánú roghnóirí
-Index: kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop
-===================================================================
---- kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kate/plugins/kte_iconinserter/ktexteditor_iconinserter.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -10,6 +10,7 @@
- Comment[en_GB]=Select an icon and use it as a KIcon in your source-code
- Comment[es]=Seleccionar un icono y usarlo como KIcon en su código fuente
- Comment[et]=Ikooni valimine ja selle kasutamine KIconina oma lähtekoodis
-+Comment[eu]=Hautatu ikono bat eta erabili KIcon bezala zure iturburu kodean
- Comment[fr]=Sélectionner une icône et l'utiliser comme une KIcon dans votre code source
- Comment[fy]=In byldkaike selektearje en it brûke as Kbyldkaike yn jo boarnekoade
- Comment[ga]=Roghnaigh deilbhín agus bain úsáid as mar KIcon i do chód foinseach
-@@ -53,6 +54,7 @@
- Name[en_GB]=IconInserter
- Name[es]=IconInserter
- Name[et]=Ikoonilisaja
-+Name[eu]=Ikono txertatzailea
- Name[fr]=InsertionIcone
- Name[fy]=Byldkaiketaheakker
- Name[ga]=IconInserter
-@@ -99,6 +101,7 @@
- GenericName[en_GB]=Insert Code for KIcon-Creation
- GenericName[es]=Insertar código para la creación de un KIcon
- GenericName[et]=Koodi lisamine KIconi loomiseks
-+GenericName[eu]=Txertatu KIcon sortzeko kodea
- GenericName[fr]=Insérer le code pour la création du KIcon
- GenericName[fy]=Koade foar Kbyldkaike-oanmeitsje ynfoegje
- GenericName[ga]=Ionsáigh cód le haghaidh cruthaithe KIcon
-Index: kate/plugins/exporter/ktexteditor_exporter.desktop
-===================================================================
---- kate/plugins/exporter/ktexteditor_exporter.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kate/plugins/exporter/ktexteditor_exporter.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -46,7 +46,7 @@
- Name[kk]=Экспорттау
- Name[km]=កម្មវិធីនាំចេញ
- Name[ko]=내보내기
--Name[lt]=Eksportas
-+Name[lt]=Eksportavimas
- Name[nb]=Exporter
- Name[nds]=Export
- Name[nl]=Exportprogramma
-Index: includes/CMakeLists.txt
-===================================================================
---- includes/CMakeLists.txt (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ includes/CMakeLists.txt (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -863,6 +863,7 @@
- KTextEditor/CommandInterface
- KTextEditor/ConfigInterface
- KTextEditor/ConfigPage
-+ KTextEditor/ContainerInterface
- KTextEditor/Cursor
- KTextEditor/Document
- KTextEditor/Editor
-@@ -870,6 +871,9 @@
- KTextEditor/Factory
- KTextEditor/HighlightInterface
- KTextEditor/MarkInterface
-+ KTextEditor/MovingCursor
-+ KTextEditor/MovingInterface
-+ KTextEditor/MovingRange
- KTextEditor/ModificationInterface
- KTextEditor/Plugin
- KTextEditor/Range
-@@ -884,6 +888,7 @@
- KTextEditor/SmartRangeNotifier
- KTextEditor/SmartRangeWatcher
- KTextEditor/TemplateInterface
-+ KTextEditor/TemplateInterface2
- KTextEditor/TextHintInterface
- KTextEditor/VariableInterface
- KTextEditor/View
-Index: mimetypes/kde.xml
-===================================================================
---- mimetypes/kde.xml (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ mimetypes/kde.xml (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -102,7 +102,7 @@
- <glob pattern="*.kug"/>
- </mime-type>
- <mime-type type="application/x-webarchive">
-- <sub-class-of type="application/zip"/>
-+ <sub-class-of type="application/x-compressed-tar"/>
- <comment>web archive</comment>
- <glob pattern="*.war"/>
- </mime-type>
-Index: kioslave/http/kcookiejar/kcookiejar.desktop
-===================================================================
---- kioslave/http/kcookiejar/kcookiejar.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kioslave/http/kcookiejar/kcookiejar.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -11,6 +11,7 @@
- Name[en_GB]=Cookie Jar
- Name[es]=Almacén de cookies
- Name[et]=Küpsisekarp
-+Name[eu]=Cookie ontzia
- Name[fi]=Evästeiden säilytys
- Name[fr]=Boîte à cookies
- Name[fy]=Koekjespot
-@@ -57,6 +58,7 @@
- Comment[en_GB]=Stores network cookies
- Comment[es]=Almacena cookies de la red
- Comment[et]=Võrguküpsiste salvestamine
-+Comment[eu]=Sareko cookie-ak biltegiratzen ditu
- Comment[fi]=Säilyttää verkkoevästeitä
- Comment[fr]=Enregistre les cookies réseaux
- Comment[fy]=Bewarret netwurk koekjes
-Index: kioslave/http/http_cache_cleaner.desktop
-===================================================================
---- kioslave/http/http_cache_cleaner.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kioslave/http/http_cache_cleaner.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -160,7 +160,7 @@
- Comment[pt_BR]=Limpa itens antigos do cache HTTP
- Comment[ro]=Elimină înregistrările vechi din cache-ul HTTP
- Comment[ru]=Удаление устаревших элементов из кеша HTTP
--Comment[se]=Buhtista boares merko3/4iid HTTP gaskarádjosis
-+Comment[se]=Buhtista boares merkošiid HTTP gaskarádjosis
- Comment[sk]=Vyčistí staré položky z vyrovnávacej pamäte HTTP
- Comment[sl]=Zbriše stare vnose iz pomnilnika HTTP
- Comment[sr]=Чисти старе ставке из ХТТП кеша
-Index: nepomuk/query/query.cpp
-===================================================================
---- nepomuk/query/query.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ nepomuk/query/query.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -65,6 +65,16 @@
- ORDER BY desc (?
- */
-
-+namespace {
-+ QStringList urlsToStringList( const KUrl::List& urls, KUrl::AdjustPathOption opt ) {
-+ QStringList lst;
-+ for( KUrl::List::ConstIterator it = urls.constBegin();
-+ it != urls.constEnd(); ++it ) {
-+ lst.append( it->url(opt) );
-+ }
-+ return lst;
-+ }
-+}
-
-
- QString Nepomuk::Query::QueryPrivate::createFolderFilter( const QString& resourceVarName, QueryBuilderData* qbd ) const
-@@ -73,10 +83,10 @@
- QString uriVarName = qbd->uniqueVarName();
- QString filter = resourceVarName + ' ' + Soprano::Node::resourceToN3( Nepomuk::Vocabulary::NIE::url() ) + ' ' + uriVarName + QLatin1String( " . " );
- if ( !m_includeFolders.isEmpty() ) {
-- filter += QString( " FILTER(REGEX(STR(%1), \"^(%2/)\")) ." ).arg( uriVarName ).arg( m_includeFolders.toStringList().join( "|" ) );
-+ filter += QString( " FILTER(REGEX(STR(%1), \"^(%2)\")) ." ).arg( uriVarName ).arg( urlsToStringList(m_includeFolders, KUrl::AddTrailingSlash).join( "|" ) );
- }
- if ( !m_excludeFolders.isEmpty() ) {
-- filter += QString( " FILTER(!REGEX(STR(%1), \"^(%2/)\")) ." ).arg( uriVarName ).arg( m_excludeFolders.toStringList().join( "|" ) );
-+ filter += QString( " FILTER(!REGEX(STR(%1), \"^(%2)\")) ." ).arg( uriVarName ).arg( urlsToStringList(m_excludeFolders, KUrl::AddTrailingSlash).join( "|" ) );
- }
- return filter;
- }
-@@ -361,7 +371,8 @@
- d->m_isFileQuery ? QString() : instanceBaseRestriction );
-
- // add optional order terms
-- queryBase += qbd.buildOrderString();
-+ if( !(flags & CreateCountQuery) )
-+ queryBase += qbd.buildOrderString();
-
- // offset and limit
- if ( d->m_offset > 0 )
-Index: nepomuk/query/query_p.cpp
-===================================================================
---- nepomuk/query/query_p.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ nepomuk/query/query_p.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -28,6 +28,7 @@
-
- #include <Soprano/Vocabulary/RDF>
-
-+#include <QtCore/QSet>
-
- namespace {
- Nepomuk::Query::Term flattenGroupTerms( const Nepomuk::Query::Term& term )
-@@ -42,19 +43,22 @@
- it != end; ++it ) {
- const Nepomuk::Query::Term& t = *it;
- Nepomuk::Query::Term ot = flattenGroupTerms( t );
-- if ( ot.isValid() ) {
-- if ( ot.type() == term.type() ) {
-- newSubTerms += static_cast<const Nepomuk::Query::GroupTerm&>( ot ).subTerms();
-- }
-- else {
-- newSubTerms += ot;
-- }
-+ QList<Nepomuk::Query::Term> terms;
-+ if ( ot.type() == term.type() ) {
-+ terms = static_cast<const Nepomuk::Query::GroupTerm&>( ot ).subTerms();
- }
-+ else if( ot.isValid() ) {
-+ terms += ot;
-+ }
-+ Q_FOREACH( const Nepomuk::Query::Term& t, terms ) {
-+ if( !newSubTerms.contains( t ) )
-+ newSubTerms += t;
-+ }
- }
- if ( newSubTerms.count() == 0 )
- return Nepomuk::Query::Term();
- else if ( newSubTerms.count() == 1 )
-- return newSubTerms.first();
-+ return *newSubTerms.begin();
- else if ( term.isAndTerm() )
- return Nepomuk::Query::AndTerm( newSubTerms );
- else
-Index: kimgio/ras.desktop
-===================================================================
---- kimgio/ras.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kimgio/ras.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -11,6 +11,7 @@
- Name[en_GB]=RAS
- Name[es]=RAS
- Name[et]=RAS
-+Name[eu]=RAS
- Name[fr]=RAS
- Name[fy]=RAS
- Name[ga]=RAS
-Index: kio/kio/kfileitemdelegate.cpp
-===================================================================
---- kio/kio/kfileitemdelegate.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/kio/kfileitemdelegate.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -588,10 +588,10 @@
- {
- int value = int(0xff * amount);
-
-- if (value == 0)
-+ if (value == 0 || to.isNull())
- return from;
-
-- if (value == 0xff)
-+ if (value == 0xff || from.isNull())
- return to;
-
- QColor color;
-Index: kio/kio/accessmanager.cpp
-===================================================================
---- kio/kio/accessmanager.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/kio/accessmanager.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -308,7 +308,7 @@
-
- if (reply.isValid()) {
- const QString cookieStr = reply.value();
-- const QStringList cookies = cookieStr.split(QL1S("; "));
-+ const QStringList cookies = cookieStr.split(QL1S("; "), QString::SkipEmptyParts);
- Q_FOREACH(const QString& cookie, cookies) {
- const int index = cookie.indexOf(QL1C('='));
- const QString name = cookie.left(index);
-Index: kio/bookmarks/kbookmark.h
-===================================================================
---- kio/bookmarks/kbookmark.h (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/bookmarks/kbookmark.h (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -24,6 +24,7 @@
-
- #include <QtCore/QString>
- #include <QtCore/QList>
-+#include <QtCore/QMetaType>
- #include <QtXml/QDomElement>
- #include <kurl.h>
-
-@@ -460,4 +461,7 @@
- virtual void visitLeave(const KBookmarkGroup &);
- };
-
-+#define KIO_KBOOKMARK_METATYPE_DEFINED 1
-+Q_DECLARE_METATYPE( KBookmark )
-+
- #endif
-Index: kio/kfile/kfilemetadatawidget.h
-===================================================================
---- kio/kfile/kfilemetadatawidget.h (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/kfile/kfilemetadatawidget.h (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -51,6 +51,8 @@
-
- /**
- * Sets the items for which the meta data should be shown.
-+ * The signal metaDataRequestFinished() will be emitted,
-+ * as soon as the meta data for the items has been received.
- */
- void setItems(const KFileItemList& items);
- KFileItemList items() const;
-@@ -72,6 +74,13 @@
- */
- void urlActivated(const KUrl& url);
-
-+ /**
-+ * Is emitted after the meta data has been received for the items
-+ * set by KFileMetaDataWidget::setItems().
-+ * @since 4.5.1
-+ */
-+ void metaDataRequestFinished(const KFileItemList& items);
-+
- protected:
- virtual bool event(QEvent* event);
-
-Index: kio/kfile/kfilemetadatawidget.cpp
-===================================================================
---- kio/kfile/kfilemetadatawidget.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/kfile/kfilemetadatawidget.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -48,7 +48,6 @@
- #include <QThread>
- #endif
-
--
- // The default size hint of QLabel tries to return a square size.
- // This does not work well in combination with layouts that use
- // heightForWidth(): In this case it is possible that the content
-@@ -66,6 +65,7 @@
- QLabel(parent)
- {
- }
++ // load the settings for the speller
++ updateConfig();
+
- QSize ValueWidget::sizeHint() const
- {
- QFontMetrics metrics(font());
-@@ -425,6 +425,7 @@
- #endif
-
- q->updateGeometry();
-+ emit q->metaDataRequestFinished(m_fileItems);
- }
+ foreach(KTextEditor::View* view, document->views()) {
+ addView(document, view);
+ }
+@@ -407,6 +411,7 @@
+ this,
+ SLOT(misspelling(const QString&,int)));
+ connect(m_backgroundChecker, SIGNAL(done()), this, SLOT(spellCheckDone()));
++ m_backgroundChecker->restore(KGlobal::config().data());
+ }
+ m_backgroundChecker->setSpeller(m_speller);
+ m_backgroundChecker->setText(text); // don't call 'start()' after this!
+@@ -665,6 +670,9 @@
+ {
+ ON_THE_FLY_DEBUG;
+ m_speller.restore(KGlobal::config().data());
++ if(m_backgroundChecker) {
++ m_backgroundChecker->restore(KGlobal::config().data());
++ }
+ }
+
+ void KateOnTheFlyChecker::refreshSpellCheck(const KTextEditor::Range &range)
+Index: kate/spellcheck/spellcheckdialog.cpp
+===================================================================
+--- kate/spellcheck/spellcheckdialog.cpp (.../tags/KDE/4.5.1/kdelibs) (wersja 1170564)
++++ kate/spellcheck/spellcheckdialog.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1170564)
+@@ -110,15 +110,13 @@
+ {
+ m_speller = new Sonnet::Speller();
+ }
+- else
+- {
+- m_speller->restore(KGlobal::config().data());
+- }
++ m_speller->restore(KGlobal::config().data());
+
+ if ( !m_backgroundChecker )
+ {
+ m_backgroundChecker = new Sonnet::BackgroundChecker(*m_speller);
+ }
++ m_backgroundChecker->restore(KGlobal::config().data());
- void KFileMetaDataWidget::Private::removeOutdatedRows()
-Index: kio/misc/kpac/proxyscout.notifyrc
+ if ( !m_sonnetDialog )
+ {
+Index: nepomuk/types/entitymanager.cpp
===================================================================
---- kio/misc/kpac/proxyscout.notifyrc (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/misc/kpac/proxyscout.notifyrc (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -12,6 +12,7 @@
- Comment[en_GB]=Network Proxy Configuration
- Comment[es]=Configuración del proxy de la red
- Comment[et]=Võrgupuhverserveri seadistamine
-+Comment[eu]=Sareko ordezkariaren konfiguraketa
- Comment[fi]=Verkon välityspalvelinasetukset
- Comment[fr]=Configuration du réseau mandataire
- Comment[fy]=Netwurk proksy ynstelling
-@@ -72,7 +73,7 @@
- Name[eo]=Nevalida prokura skripto
- Name[es]=Script de proxy no válido
- Name[et]=Vigane puhverserveri skript
--Name[eu]=Proxy script baliogabea
-+Name[eu]=Ordezkariaren script baliogabea
- Name[fa]=دستنوشتهٔ نامعتبر پیشکار
- Name[fi]=Virheellinen välityspalvelinkomentosarja
- Name[fr]=Script pour serveur mandataire non valable
-@@ -156,7 +157,7 @@
- Comment[eo]=La elŝutita prokura agordoskripto estas nevalida
- Comment[es]=El script de configuración del proxy descargado no es válido
- Comment[et]=Allalaaditud puhverserveri seadistuse skript on vigane
--Comment[eu]=Deskargatutako proxy-aren konfigurazioko script-a baliogabea da
-+Comment[eu]=Jaitsitako ordezkaria konfiguratzeko script-a baliogabea da
- Comment[fa]=دستنوشتهٔ پیکربندی پیشکار بارگیری شده نامعتبر است
- Comment[fi]=Ladattu välityspalvelin asetuskomentosarja on virheellinen
- Comment[fr]=Le script téléchargé de configuration du serveur mandataire n'est pas valable
-@@ -329,7 +330,7 @@
- Comment[eo]=Ne povis elŝuti la prokuran agordoskripton
- Comment[es]=No se puede descargar el script de configuración del proxy
- Comment[et]=Puhverserveri seadistuse skripti allalaadimine nurjus
--Comment[eu]=Proxy-aren konfigurazioko script-a ezin izan da deskargatu
-+Comment[eu]=Ordezkaria konfiguratzeko script-a ezin izan da deskargatu
- Comment[fa]=دستنوشتهٔ پیکربندی پیشکار نتوانست بارگیری شود
- Comment[fi]=Välityspalvelimen asetuskomentosarjan lataaminen ei onnistunut
- Comment[fr]=Le script de configuration du serveur mandataire (proxy) n'a pas pu être téléchargé
-@@ -500,7 +501,7 @@
- Comment[eo]=Eraro okazis pri plenumo de la prokura agordoskripto
- Comment[es]=Ocurrió un error al ejecutar el script de configuración del proxy
- Comment[et]=Ilmnes tõsine viga puhverserveri seadistuse skripti käivitamisel
--Comment[eu]=Errorea gertatu da proxy-a konfiguratzeko script-ean
-+Comment[eu]=Akatsa gertatu da ordezkaria konfiguratzeko script-a exekutatzerakoan
- Comment[fa]=خطایی در اجرای دستنوشتهٔ پیکربندی پیشکار وجود داشت
- Comment[fi]=Välityspalvelimen asetuskomentosarjan suorittamisessa tapahtui virhe
- Comment[fr]=Une erreur s'est produite lors de l'exécution du script de configuration du serveur mandataire (proxy)
-Index: kio/misc/kpac/proxyscout.desktop
-===================================================================
---- kio/misc/kpac/proxyscout.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kio/misc/kpac/proxyscout.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -12,6 +12,7 @@
- Name[en_GB]=Network Proxy Configuration
- Name[es]=Configuración del proxy de la red
- Name[et]=Võrgupuhverserveri seadistamine
-+Name[eu]=Sareko ordezkariaren konfiguraketa
- Name[fi]=Verkon välityspalvelinasetukset
- Name[fr]=Configuration du réseau mandataire
- Name[fy]=Netwurk proksy ynstelling
-@@ -73,7 +74,7 @@
- Comment[eo]=Aŭtomata prokuragordo
- Comment[es]=Configuración automática del proxy
- Comment[et]=Automaatne puhverserveri seadistamine
--Comment[eu]=Proxy-aren konfigurazio automatikoa
-+Comment[eu]=Ordezkariaren konfiguraketa automatikoa
- Comment[fa]=پیکربندی خودکار پیشکار
- Comment[fi]=Automaattiset välityspalvelinasetukset
- Comment[fr]=Configuration automatique du serveur mandataire
-Index: kutils/kemoticons/providers/kde/emoticonstheme_kde.desktop
-===================================================================
---- kutils/kemoticons/providers/kde/emoticonstheme_kde.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kutils/kemoticons/providers/kde/emoticonstheme_kde.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -12,6 +12,7 @@
- Name[en_GB]=KDE Emoticons Theme
- Name[es]=Tema de emoticonos de KDE
- Name[et]=KDE emotikoniteema
-+Name[eu]=KDE emotikono gaia
- Name[fi]=KDE-hymiöteemat
- Name[fr]=Thèmes d'émoticônes KDE
- Name[fy]=KDE emobyldkaikes tema
-Index: kdecore/network/kssld/kssld.desktop
-===================================================================
---- kdecore/network/kssld/kssld.desktop (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kdecore/network/kssld/kssld.desktop (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -15,6 +15,7 @@
- Name[en_GB]=SSL Certificate Policy
- Name[es]=Política de certificados SSL
- Name[et]=SSL sertifikadi reegel
-+Name[eu]=SSL ziurtagiri politika
- Name[fi]=SSL-varmennekäytäntö
- Name[fr]=Politique de certificats SSL
- Name[fy]=SSL sertifikaat belied
-@@ -62,6 +63,7 @@
- Comment[en_GB]=Provides SSL certificate policy to applications
- Comment[es]=Proporciona a las aplicaciones una política de certificados SSL
- Comment[et]=SSL sertifikaadi reegli edastamine rakendustele
-+Comment[eu]=Aplikazioei SSL ziurtagiri politika hornitzen die
- Comment[fi]=Tarjoaa SSL-varmennekäytännön sovelluksille
- Comment[fr]=Fournit une politique de certificats SSL aux applications
- Comment[fy]=Ferskaft SSL sertifikaat belied oan programma's
-Index: kdecore/tests/karchivetest.cpp
-===================================================================
---- kdecore/tests/karchivetest.cpp (.../tags/KDE/4.5.0/kdelibs) (wersja 1165573)
-+++ kdecore/tests/karchivetest.cpp (.../branches/KDE/4.5/kdelibs) (wersja 1165573)
-@@ -17,6 +17,7 @@
- Boston, MA 02110-1301, USA.
- */
-
-+#include <config.h>
-
- #include "karchivetest.h"
- #include <kmimetype.h>
-@@ -38,61 +39,49 @@
-
- static const int SIZE1 = 100;
-
-+/**
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branch.diff?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.208&r2=1.209&f=u
More information about the pld-cvs-commit
mailing list