[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=13ff40c

The following commit has been merged in the master branch:
commit 13ff40c6eced3186e4cb4d1bad59f9f8a2a5ba34
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Mon Oct 12 14:06:47 2009 +0100

    Update kubuntu_02_microblog_default_configuration.diff, fix
    setting of when applet needs configuration and fix downloading of
    authenticated accounts timelines.  Closes LP: #414572 (also
    https://bugs.kde.org/200475)
---
 debian/changelog                                               | 9 +++++++++
 debian/patches/kubuntu_02_microblog_default_configuration.diff | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36955bd..e4c2dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.3.2-0ubuntu2) karmic; urgency=low
+
+  * Update kubuntu_02_microblog_default_configuration.diff, fix
+    setting of when applet needs configuration and fix downloading of
+    authenticated accounts timelines.  Closes LP: #414572 (also
+    https://bugs.kde.org/200475)
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 12 Oct 2009 14:05:24 +0100
+
 kdeplasma-addons (4:4.3.2-0ubuntu1) karmic; urgency=low
 
   * New upstream release
diff --git a/debian/patches/kubuntu_02_microblog_default_configuration.diff b/debian/patches/kubuntu_02_microblog_default_configuration.diff
index f484d48..1f12336 100644
--- a/debian/patches/kubuntu_02_microblog_default_configuration.diff
+++ b/debian/patches/kubuntu_02_microblog_default_configuration.diff
@@ -61,7 +61,7 @@ Index: kdeplasma-addons-4.2.96/applets/microblog/microblog.cpp
  {
 -    setConfigurationRequired(required);
 +    if (!QFile::exists("/usr/bin/ubiquity")) {
-+	    setConfigurationRequired(true);
++	    setConfigurationRequired(required);
 +    }
      m_statusEdit->setEnabled(!required);
  }
@@ -137,7 +137,7 @@ Index: kdeplasma-addons-4.2.96/dataengines/microblog/timelinesource.cpp
  void TimelineSource::update()
  {
 -    if (m_job || (!account().isEmpty() && password().isEmpty())) {
-+    if (m_job) {
++    if ( account() != "kubuntu" && (m_job || (!account().isEmpty() && password().isEmpty())) ) {
          // We are already performing a fetch, let's not bother starting over
          //kDebug() << "already updating....." << account() << password();
          return;

-- 
KDE Plasma Addons module packaging