packages: kde4-kdegraphics/kde4-kdegraphics-branch.diff, kde4-kdegraphics/k...
arekm
arekm at pld-linux.org
Thu Aug 19 19:34:31 CEST 2010
Author: arekm Date: Thu Aug 19 17:34:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4; branch diff is back
---- Files affected:
packages/kde4-kdegraphics:
kde4-kdegraphics-branch.diff (1.2 -> 1.3) , kde4-kdegraphics.spec (1.95 -> 1.96)
---- Diffs:
================================================================
Index: packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff
diff -u packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff:1.2 packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff:1.3
--- packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff:1.2 Wed Aug 19 22:56:55 2009
+++ packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff Thu Aug 19 19:34:25 2010
@@ -1,338 +1,775 @@
-Index: libs/libksane/libksane/ksane_viewer.cpp
+Index: libs/libkexiv2/libkexiv2/kexiv2exif.cpp
===================================================================
---- libs/libksane/libksane/ksane_viewer.cpp (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ libs/libksane/libksane/ksane_viewer.cpp (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -244,8 +244,8 @@
- {
- if ((d->selection->rect().width() >0.001) &&
- (d->selection->rect().height() > 0.001) &&
-- (d->pixmapItem->pixmap().width() - d->selection->rect().width() > 0.001) &&
-- (d->pixmapItem->pixmap().height() - d->selection->rect().height() > 0.001))
-+ ((d->pixmapItem->pixmap().width() - d->selection->rect().width() > 0.001) ||
-+ (d->pixmapItem->pixmap().height() - d->selection->rect().height() > 0.001)))
+--- libs/libkexiv2/libkexiv2/kexiv2exif.cpp (.../tags/KDE/4.5.0/kdegraphics) (wersja 1165576)
++++ libs/libkexiv2/libkexiv2/kexiv2exif.cpp (.../branches/KDE/4.5/kdegraphics) (wersja 1165576)
+@@ -980,10 +980,33 @@
+
+ KExiv2::TagsMap KExiv2::getMakernoteTagsList() const
+ {
+-#if (EXIV2_TEST_VERSION(0,18,1))
+ try
+ {
+ QList<const Exiv2::TagInfo*> tags;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++
++ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++
++ while (gi->ifdId_ != Exiv2::lastIfdId)
++ {
++ if (QString(gi->name_) == QString("Makernote"))
++ {
++ Exiv2::TagListFct tl = gi->tagList_;
++ const Exiv2::TagInfo* ti = tl();
++
++ while (ti->tag_ != 0xFFFF)
++ {
++ tags << ti;
++ ++ti;
++ }
++ }
++ ++gi;
++ }
++
++#else
++
++#if (EXIV2_TEST_VERSION(0,18,1))
+ tags
+ // Canon Makernotes.
+ << Exiv2::CanonMakerNote::tagList()
+@@ -994,7 +1017,7 @@
+ << Exiv2::CanonMakerNote::tagListPi()
+ #if (EXIV2_TEST_VERSION(0,19,1))
+ << Exiv2::CanonMakerNote::tagListFi()
+-#endif
++#endif // (EXIV2_TEST_VERSION(0,19,1))
+ // Sigma Makernotes.
+ << Exiv2::SigmaMakerNote::tagList()
+ // Sony Makernotes.
+@@ -1002,7 +1025,7 @@
+ #if (EXIV2_TEST_VERSION(0,19,1))
+ << Exiv2::SonyMakerNote::tagListCs()
+ << Exiv2::SonyMakerNote::tagListCs2()
+-#endif
++#endif // (EXIV2_TEST_VERSION(0,19,1))
+ // Minolta Makernotes.
+ << Exiv2::MinoltaMakerNote::tagList()
+ << Exiv2::MinoltaMakerNote::tagListCsStd()
+@@ -1031,6 +1054,10 @@
+ // Fuji Makernotes.
+ << Exiv2::FujiMakerNote::tagList();
+
++#endif // (EXIV2_TEST_VERSION(0,18,1))
++
++#endif // (EXIV2_TEST_VERSION(0,21,0))
++
+ TagsMap tagsMap;
+ for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it)
+ {
+@@ -1050,7 +1077,6 @@
{
- d->selection->setVisible(true);
+ d->printExiv2ExceptionError("Cannot get Makernote Tags list using Exiv2 ", e);
}
-Index: gwenview/app/kipiinterface.cpp
+-#endif
+
+ return TagsMap();
+ }
+Index: libs/libkexiv2/libkexiv2/kexiv2_p.cpp
===================================================================
---- gwenview/app/kipiinterface.cpp (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ gwenview/app/kipiinterface.cpp (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -352,8 +352,7 @@
-
-
- void KIPIInterface::slotDirectoryChanged() {
--// TODO check if getting it from selected
-- emit currentAlbumChanged(d->mMainWindow->contextManager()->selection().count() >0);
-+ emit currentAlbumChanged(true);
- }
-
- } //namespace
-Index: gwenview/app/main.cpp
-===================================================================
---- gwenview/app/main.cpp (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ gwenview/app/main.cpp (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -39,7 +39,7 @@
- "gwenview", /* appname */
- 0, /* catalogName */
- ki18n("Gwenview"), /* programName */
-- "2.3.0"); /* version */
-+ "2.3.1"); /* version */
- aboutData.setShortDescription(ki18n("An Image Viewer"));
- aboutData.setLicense(KAboutData::License_GPL);
- aboutData.setCopyrightStatement(ki18n("Copyright 2000-2009 Aurélien Gâteau"));
-Index: gwenview/part/gvpart.cpp
-===================================================================
---- gwenview/part/gvpart.cpp (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ gwenview/part/gvpart.cpp (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -116,7 +116,7 @@
- "gvpart", /* appname */
- "gwenview", /* catalogName */
- ki18n("Gwenview KPart"), /* programName */
-- "2.1"); /* version */
-+ "2.3.1"); /* version */
- aboutData->setShortDescription(ki18n("An Image Viewer"));
- aboutData->setLicense(KAboutData::License_GPL);
- aboutData->setCopyrightStatement(ki18n("Copyright 2000-2008 Aurélien Gâteau"));
-Index: gwenview/NEWS
-===================================================================
---- gwenview/NEWS (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ gwenview/NEWS (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -1,3 +1,7 @@
-+# 2.3.1
-+## Fixes
-+- Ensure "Advanced Slideshow" plugin is always enabled.
-+
- # 2.3.0
- ## New features
- - Gwenview can now play videos (bug #174522).
-Index: thumbnailers/mobi/mobithumbnail.desktop
-===================================================================
---- thumbnailers/mobi/mobithumbnail.desktop (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ thumbnailers/mobi/mobithumbnail.desktop (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -4,7 +4,7 @@
- Name[ar]=مولد مصغرات Mobipocket
- Name[ca]=Miniaturitzador de Mobipocket
- Name[da]=Mobipocket-miniaturer
--Name[de]=M
-+Name[de]=Mobipocket-Minibild
- Name[el]=Δημιουργία εικόνων επισκόπησης Mobipocket
- Name[es]=Generador de miniaturas Mobipocket
- Name[et]=Mobipocketi pisipildid
-@@ -25,7 +25,7 @@
- Name[pa]=ਮੋਬਾਪਾਕਟ ਥੰਮਨੇਲਰ
- Name[pt]=Miniaturas para o Mobipocket
- Name[pt_BR]=Miniatura do Mobipocket
--Name[ru]=Создание эскизов Mobipocket
-+Name[ru]=Создание миниатюр Mobipocket
- Name[sl]=Ustvarjalnik sličic za Mobipocket
- Name[sr]=Генератор сличица за Мобипокет
- Name[sr at latin]=Generator sličica za Mobipocket
-Index: okular/core/document.cpp
+--- libs/libkexiv2/libkexiv2/kexiv2_p.cpp (.../tags/KDE/4.5.0/kdegraphics) (wersja 1165576)
++++ libs/libkexiv2/libkexiv2/kexiv2_p.cpp (.../branches/KDE/4.5/kdegraphics) (wersja 1165576)
+@@ -33,7 +33,9 @@
+ imageComments.clear();
+ exifMetadata.clear();
+ iptcMetadata.clear();
++#ifdef _XMP_SUPPORT_
+ xmpMetadata.clear();
++#endif
+ }
+
+ KExiv2Priv::KExiv2Priv()
+@@ -50,7 +52,7 @@
+ void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)
+ {
+ std::string s(e.what());
+- kDebug(51003) << msg.toAscii().constData() << " (Error #"
++ kDebug(51003) << msg.toAscii().constData() << " (Error #"
+ << e.code() << ": " << s.c_str() << endl;
+ }
+
+Index: libs/libkexiv2/libkexiv2/kexiv2_p.h
===================================================================
---- okular/core/document.cpp (.../tags/KDE/4.3.0/kdegraphics) (wersja 1013435)
-+++ okular/core/document.cpp (.../branches/KDE/4.3/kdegraphics) (wersja 1013435)
-@@ -113,6 +113,7 @@
- Qt::CaseSensitivity cachedCaseSensitivity;
- bool cachedViewportMove : 1;
- bool cachedNoDialogs : 1;
-+ bool isCurrentlySearching : 1;
- QColor cachedColor;
- };
+--- libs/libkexiv2/libkexiv2/kexiv2_p.h (.../tags/KDE/4.5.0/kdegraphics) (wersja 1165576)
++++ libs/libkexiv2/libkexiv2/kexiv2_p.h (.../branches/KDE/4.5/kdegraphics) (wersja 1165576)
+@@ -26,7 +26,7 @@
+
+ #include "kexiv2.h"
+
+- // C++ includes.
++ // C++ includes
+
+ #include <cstdlib>
+ #include <cstdio>
+@@ -37,7 +37,7 @@
+ #include <iomanip>
+ #include <string>
+
+-// Qt includes.
++// Qt includes
+
+ #include <QBuffer>
+ #include <QFile>
+@@ -49,7 +49,7 @@
+ #include <QDataStream>
+ #include <QSharedData>
+
+-// KDE includes.
++// KDE includes
+
+ #include <ktemporaryfile.h>
+ #include <kencodingdetector.h>
+@@ -57,14 +57,19 @@
+ #include <kdeversion.h>
+ #include <kdebug.h>
+
+-// Exiv2 includes.
++// Exiv2 includes -------------------------------------------------------
+
++// NOTE: All Exiv2 header must be stay there to not expose external source code to Exiv2 API
++// and reduce Exiv2 dependency to client code.
++
+ // The pragmas are required to be able to catch exceptions thrown by libexiv2:
+ // See http://gcc.gnu.org/wiki/Visibility, the section about c++ exceptions.
+ // They are needed for all libexiv2 versions that do not care about visibility.
+ #ifdef __GNUC__
+ #pragma GCC visibility push(default)
+ #endif
++
++#include <exiv2/exv_conf.h>
+ #include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
+ #include <exiv2/jpgimage.hpp>
+@@ -74,25 +79,11 @@
+ #include <exiv2/properties.hpp>
+ #include <exiv2/types.hpp>
+ #include <exiv2/exif.hpp>
+-#include <exiv2/canonmn.hpp>
+-#include <exiv2/sigmamn.hpp>
+-#include <exiv2/sonymn.hpp>
+-#include <exiv2/minoltamn.hpp>
+-#include <exiv2/nikonmn.hpp>
+-#include <exiv2/olympusmn.hpp>
+-#include <exiv2/panasonicmn.hpp>
+-#include <exiv2/pentaxmn.hpp>
+-#include <exiv2/fujimn.hpp>
+-//#include <exiv2/preview.hpp>
+-#ifdef __GNUC__
+-#pragma GCC visibility pop
+-#endif
++#include <exiv2/xmpsidecar.hpp>
+
+ // Check if Exiv2 support XMP
+
+-#if (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION ==15 && EXIV2_PATCH_VERSION >=99) || \
+- (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION >15 ) || \
+- (EXIV2_MAJOR_VERSION >0)
++#ifdef EXV_HAVE_XMP_TOOLKIT
+ # define _XMP_SUPPORT_ 1
+ #endif
+
+@@ -107,16 +98,29 @@
+ # define EXIV2_TEST_VERSION(major,minor,patch) (false)
+ #endif
+
+-#ifndef _XMP_SUPPORT_
++#if (EXIV2_TEST_VERSION(0,21,0))
+
+-// Dummy redifinition of XmpData class to compile fine
+-// if XMP metadata support is not available from Exiv2
+-namespace Exiv2
+-{
+- class XmpData{};
+-}
+-#endif // _XMP_SUPPORT_
++// With exiv2 > 0.20.0, all makernote header files have been removed to increase binary compatibility.
++// See Exiv2 bugzilla entry http://dev.exiv2.org/issues/719
++// and wiki topic http://dev.exiv2.org/boards/3/topics/583
++#else
++#include <exiv2/canonmn.hpp>
++#include <exiv2/sigmamn.hpp>
++#include <exiv2/sonymn.hpp>
++#include <exiv2/minoltamn.hpp>
++#include <exiv2/nikonmn.hpp>
++#include <exiv2/olympusmn.hpp>
++#include <exiv2/panasonicmn.hpp>
++#include <exiv2/pentaxmn.hpp>
++#include <exiv2/fujimn.hpp>
++#endif
+
++#ifdef __GNUC__
++#pragma GCC visibility pop
++#endif
++
++// End of Exiv2 headers ------------------------------------------------------
++
+ namespace KExiv2Iface
+ {
+
+@@ -163,14 +167,20 @@
-@@ -1008,6 +1009,10 @@
+ const Exiv2::ExifData& exifMetadata() const { return data.constData()->exifMetadata; }
+ const Exiv2::IptcData& iptcMetadata() const { return data.constData()->iptcMetadata; }
+- const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; }
+ const std::string& imageComments() const { return data.constData()->imageComments; }
+
++#ifdef _XMP_SUPPORT_
++ const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; }
++#endif
++
+ Exiv2::ExifData& exifMetadata() { return data.data()->exifMetadata; }
+ Exiv2::IptcData& iptcMetadata() { return data.data()->iptcMetadata; }
+- Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; }
+ std::string& imageComments() { return data.data()->imageComments; }
+
++#ifdef _XMP_SUPPORT_
++ Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; }
++#endif
++
+ public:
+
+ bool writeRawFiles;
+Index: libs/libkexiv2/libkexiv2/kexiv2xmp.cpp
+===================================================================
+--- libs/libkexiv2/libkexiv2/kexiv2xmp.cpp (.../tags/KDE/4.5.0/kdegraphics) (wersja 1165576)
++++ libs/libkexiv2/libkexiv2/kexiv2xmp.cpp (.../branches/KDE/4.5/kdegraphics) (wersja 1165576)
+@@ -44,7 +44,7 @@
+ catch( Exiv2::Error& e )
{
- // if the user cancelled but he just got a match, give him the match!
- QApplication::restoreOverrideCursor();
+ std::string s(e.what());
+- kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #"
++ kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #"
+ << e.code() << ": " << s.c_str() << ")" << endl;
+ }
+
+@@ -52,9 +52,11 @@
+
+ #else
+
+- return false;
++ Q_UNUSED(filePath);
+
+ #endif // _XMP_SUPPORT_
+
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
++ return false;
+ }
+
+ bool KExiv2::hasXmp() const
+@@ -142,6 +144,10 @@
+ d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e);
+ }
+
++#else
++
++ Q_UNUSED(data);
+
- emit m_parent->searchFinished( searchID, Document::SearchCancelled );
- delete pagesToNotify;
- return;
-@@ -1058,11 +1063,13 @@
+ #endif // _XMP_SUPPORT_
- bool foundAMatch = false;
+ return false;
+@@ -229,6 +235,11 @@
+ d->printExiv2ExceptionError("Cannot parse Xmp metadata using Exiv2 ", e);
+ }
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
++#else
+
- // if a match has been found..
- if ( match )
++ Q_UNUSED(xmpKeysFilter);
++ Q_UNUSED(invertSelection);
++
+ #endif // _XMP_SUPPORT_
+
+ return MetaDataMap();
+@@ -238,17 +249,21 @@
+ {
+ #ifdef _XMP_SUPPORT_
+
+- try
++ try
{
- // update the RunningSearch structure adding this match..
-- RunningSearch * s = m_searches[searchID];
- foundAMatch = true;
- s->continueOnPage = currentPage;
- s->continueOnMatch = *match;
-@@ -1110,6 +1117,10 @@
+ std::string xmpkey(xmpTagName);
+ Exiv2::XmpKey xk(xmpkey);
+ return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyTitle(xk) );
+ }
+- catch (Exiv2::Error& e)
++ catch (Exiv2::Error& e)
{
- // if the user cancelled but he just got a match, give him the match!
- QApplication::restoreOverrideCursor();
+ d->printExiv2ExceptionError("Cannot get Xmp metadata tag title using Exiv2 ", e);
+ }
+
++#else
+
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
++ Q_UNUSED(xmpTagName);
+
- emit m_parent->searchFinished( searchID, Document::SearchCancelled );
- delete pagesToNotify;
- return;
-@@ -1159,13 +1170,15 @@
- // reset cursor to previous shape
- QApplication::restoreOverrideCursor();
+ #endif // _XMP_SUPPORT_
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
+ return QString();
+@@ -257,16 +272,22 @@
+ QString KExiv2::getXmpTagDescription(const char* xmpTagName)
+ {
+ #ifdef _XMP_SUPPORT_
+- try
+
- bool foundAMatch = false;
++ try
+ {
+ std::string xmpkey(xmpTagName);
+ Exiv2::XmpKey xk(xmpkey);
+ return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyDesc(xk) );
+ }
+- catch (Exiv2::Error& e)
++ catch (Exiv2::Error& e)
+ {
+ d->printExiv2ExceptionError("Cannot get Xmp metadata tag description using Exiv2 ", e);
+ }
++
++#else
++
++ Q_UNUSED(xmpTagName);
++
+ #endif // _XMP_SUPPORT_
- // if a match has been found..
- if ( match )
+ return QString();
+@@ -299,6 +320,11 @@
+ .arg(xmpTagName), e);
+ }
+
++#else
++
++ Q_UNUSED(xmpTagName);
++ Q_UNUSED(escapeCR);
++
+ #endif // _XMP_SUPPORT_
+
+ return QString();
+@@ -325,6 +351,12 @@
+ d->printExiv2ExceptionError("Cannot set Xmp tag string into image using Exiv2 ", e);
+ }
+
++#else
++
++ Q_UNUSED(xmpTagName);
++ Q_UNUSED(value);
++ Q_UNUSED(setProgramName);
++
+ #endif // _XMP_SUPPORT_
+
+ return false;
+@@ -345,8 +377,8 @@
+ AltLangMap map;
+ const Exiv2::LangAltValue &value = static_cast<const Exiv2::LangAltValue &>(it->value());
+
+- for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin();
+- it2 != value.value_.end(); ++it2)
++ for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin();
++ it2 != value.value_.end(); ++it2)
+ {
+ QString lang = QString::fromUtf8(it2->first.c_str());
+ QString text = QString::fromUtf8(it2->second.c_str());
+@@ -366,12 +398,17 @@
+ .arg(xmpTagName), e);
+ }
+
++#else
++
++ Q_UNUSED(xmpTagName);
++ Q_UNUSED(escapeCR);
++
+ #endif // _XMP_SUPPORT_
+
+ return AltLangMap();
+ }
+
+-bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values,
++bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values,
+ bool setProgramName) const
+ {
+ #ifdef _XMP_SUPPORT_
+@@ -407,6 +444,12 @@
+ d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e);
+ }
+
++#else
++
++ Q_UNUSED(xmpTagName);
++ Q_UNUSED(values);
++ Q_UNUSED(setProgramName);
++
+ #endif // _XMP_SUPPORT_
+
+ return false;
+@@ -448,12 +491,18 @@
+ .arg(xmpTagName), e);
+ }
+
++#else
++
++ Q_UNUSED(xmpTagName);
++ Q_UNUSED(langAlt);
++ Q_UNUSED(escapeCR);
++
+ #endif // _XMP_SUPPORT_
+
+ return QString();
+ }
+
+-bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value,
++bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value,
+ const QString& langAlt, bool setProgramName) const
+ {
+ #ifdef _XMP_SUPPORT_
+@@ -465,7 +514,7 @@
{
- // update the RunningSearch structure adding this match..
-- RunningSearch * s = m_searches[searchID];
- foundAMatch = true;
- s->continueOnPage = currentPage;
- s->continueOnMatch = *match;
-@@ -1214,6 +1227,10 @@
- typedef QVector<RegularAreaRect *> MatchesVector;
-
- QApplication::restoreOverrideCursor();
-+
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
-+
- emit m_parent->searchFinished( searchID, Document::SearchCancelled );
- foreach(const MatchesVector &mv, *pageMatches) qDeleteAll(mv);
- delete pageMatches;
-@@ -1256,6 +1273,7 @@
- QApplication::restoreOverrideCursor();
-
- RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
- bool foundAMatch = pageMatches->count() != 0;
- QMap< Page *, QVector<RegularAreaRect *> >::const_iterator it, itEnd;
- it = pageMatches->constBegin();
-@@ -1299,6 +1317,10 @@
- typedef QVector<MatchColor> MatchesVector;
-
- QApplication::restoreOverrideCursor();
-+
-+ RunningSearch * s = m_searches[searchID];
-+ s->isCurrentlySearching = false;
-+
- emit m_parent->searchFinished( searchID, Document::SearchCancelled );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdegraphics/kde4-kdegraphics-branch.diff?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdegraphics/kde4-kdegraphics.spec?r1=1.95&r2=1.96&f=u
More information about the pld-cvs-commit
mailing list