[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=f197331

The following commit has been merged in the master branch:
commit f197331dbe32af4d1ad6864621fef85301fe8601
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Apr 10 23:14:11 2011 +0200

    [ Romain Perier ]
    Add kubuntu_05_comic_prefetch.diff, recommended on kde-packagers.
---
 debian/changelog                              |  6 ++
 debian/patches/kubuntu_05_comic_prefetch.diff | 95 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 102 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7bcddac..66cf60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeplasma-addons (4:4.6.2-0ubuntu3) natty; urgency=low
+
+  * Add kubuntu_05_comic_prefetch.diff, recommended on kde-packagers.
+
+ -- Romain Perier <romain.perier at gmail.com>  Sun, 10 Apr 2011 10:40:45 +0200
+
 kdeplasma-addons (4:4.6.2-0ubuntu2) natty; urgency=low
 
   * Disable kubuntu_02_microblog_default_configuration.diff, it doesn't
diff --git a/debian/patches/kubuntu_05_comic_prefetch.diff b/debian/patches/kubuntu_05_comic_prefetch.diff
new file mode 100644
index 0000000..3db80fa
--- /dev/null
+++ b/debian/patches/kubuntu_05_comic_prefetch.diff
@@ -0,0 +1,95 @@
+From: Matthias Fuchs <mat69 at gmx.net>
+Date: Thu, 07 Apr 2011 13:32:26 +0000
+Subject: Fixes prefetching. Now constant useage of the comic applet does not lead to high memory usage.
+X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=4ab9e40e1e3484a4adf059164c91e06d1f5b6b76
+---
+Fixes prefetching. Now constant useage of the comic applet does not lead to high memory usage.
+REVIEW:101046
+---
+
+
+Index: kdeplasma-addons-4.6.2/applets/comic/comic.cpp
+===================================================================
+--- kdeplasma-addons-4.6.2.orig/applets/comic/comic.cpp	2011-04-10 10:40:19.520167015 +0200
++++ kdeplasma-addons-4.6.2/applets/comic/comic.cpp	2011-04-10 10:40:24.340167016 +0200
+@@ -325,16 +325,26 @@
+     }
+ }
+ 
+-void ComicApplet::dataUpdated( const QString&, const Plasma::DataEngine::Data &data )
++void ComicApplet::dataUpdated( const QString &source, const Plasma::DataEngine::Data &data )
+ {
++    //disconnect prefetched comic strips
++    if ( source != mOldSource ) {
++        mEngine->disconnectSource( source, this );
++        return;
++    }
++
+     setBusy( false );
+     setConfigurationRequired( false );
+     slotStartTimer();
+ 
+     //there was an error, display information as image
+-    if ( data[ "Error" ].toBool() ) {
+-        if ( !mShowErrorPicture && !data[ "Previous identifier suffix" ].toString().isEmpty() ) {
+-            updateComic( data[ "Previous identifier suffix" ].toString() );
++    const bool hasError = data[ "Error" ].toBool();
++    const bool errorAutoFixable = data[ "Error automatically fixable" ].toBool();
++    if ( hasError ) {
++        const QString previousIdentifierSuffix = data[ "Previous identifier suffix" ].toString();
++        if ( !mShowErrorPicture && !previousIdentifierSuffix.isEmpty() ) {
++            mEngine->disconnectSource( source, this );
++            updateComic( previousIdentifierSuffix );
+             return;
+         }
+         QPixmap errorPic( 500, 400 );
+@@ -420,6 +430,11 @@
+     mLabelUrl->setText( mWebsiteUrl.host() );
+     mImageWidget->setScaled( !mScaleComic );
+ 
++    //disconnect if there is either no error, or an error that can not be fixed automatically 
++    if ( !errorAutoFixable ) {
++        mEngine->disconnectSource( source, this );
++    }
++
+     setTabBarVisible( mShowTabBar && mUseTabs );
+     mLabelTop->setVisible( ( mShowComicAuthor || mShowComicTitle ) && !mLabelTop->text().isEmpty() );
+     mLabelId->setVisible( mShowComicIdentifier && !mLabelId->text().isEmpty() );
+@@ -449,11 +464,14 @@
+ 
+     //prefetch the previous and following comic for faster navigation
+     if ( !mNextIdentifierSuffix.isEmpty() ) {
+-        mEngine->query( mComicIdentifier + ':' + mNextIdentifierSuffix );
++        const QString prefetch = mComicIdentifier + ':' + mNextIdentifierSuffix;
++        mEngine->connectSource( prefetch, this );
++        mEngine->query( prefetch );
+     }
+-
+     if ( !mPreviousIdentifierSuffix.isEmpty() ) {
+-        mEngine->query( mComicIdentifier + ':' + mPreviousIdentifierSuffix );
++        const QString prefetch = mComicIdentifier + ':' + mPreviousIdentifierSuffix;
++        mEngine->connectSource( prefetch, this );
++        mEngine->query( prefetch );
+     }
+ }
+ 
+@@ -833,6 +851,7 @@
+ 
+     setConfigurationRequired( mComicIdentifier.isEmpty() );
+     if ( !mComicIdentifier.isEmpty() && mEngine && mEngine->isValid() ) {
++
+         setBusy( true );
+         const QString identifier = mComicIdentifier + ':' + identifierSuffix;
+ 
+Index: kdeplasma-addons-4.6.2/dataengines/comic/comic.cpp
+===================================================================
+--- kdeplasma-addons-4.6.2.orig/dataengines/comic/comic.cpp	2011-04-10 10:40:19.530167015 +0200
++++ kdeplasma-addons-4.6.2/dataengines/comic/comic.cpp	2011-04-10 10:40:24.340167016 +0200
+@@ -121,6 +121,7 @@
+         if ( status != Solid::Networking::Connected && status != Solid::Networking::Unknown ) {
+             mIdentifierError = identifier;
+             setData( identifier, QLatin1String( "Error" ), true );
++            setData( identifier, QLatin1String( "Error automatically fixable" ), true );
+             setData( identifier, QLatin1String( "Identifier" ), identifier );
+             setData( identifier, QLatin1String( "Previous identifier suffix" ), lastCachedIdentifier( identifier ) );
+             kWarning() << "No connection.";
diff --git a/debian/patches/series b/debian/patches/series
index fc93edc..5b53f1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_04_kimpanel_disable_scim.diff
 #kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
+kubuntu_05_comic_prefetch.diff

-- 
KDE Plasma Addons module packaging