[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=307ea70

The following commit has been merged in the master branch:
commit 307ea70275ed6494ffc700d9e089c31d577d03c2
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Mon Oct 12 14:46:29 2009 +0100

    Add kubuntu_06_microblog_twitter_id_fix.diff from 4.3 branch, is the
    upstream breakage part of https://bugs.kde.org/200475
---
 debian/changelog                                   |  7 ++++
 .../kubuntu_06_microblog_twitter_id_fix.diff       | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 55 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eec5a70..badba40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.3.2-0ubuntu4) karmic; urgency=low
+
+  * Add kubuntu_06_microblog_twitter_id_fix.diff from 4.3 branch, is the
+    upstream breakage part of https://bugs.kde.org/200475
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 12 Oct 2009 14:45:09 +0100
+
 kdeplasma-addons (4:4.3.2-0ubuntu3) karmic; urgency=low
 
   * Update kubuntu_02_microblog_default_configuration.diff, fix
diff --git a/debian/patches/kubuntu_06_microblog_twitter_id_fix.diff b/debian/patches/kubuntu_06_microblog_twitter_id_fix.diff
new file mode 100644
index 0000000..505b33c
--- /dev/null
+++ b/debian/patches/kubuntu_06_microblog_twitter_id_fix.diff
@@ -0,0 +1,47 @@
+--- kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:44	1033678
++++ kdeplasma-addons/applets/microblog/microblog.cpp	2009/10/10 18:54:46	1033679
+@@ -381,9 +381,9 @@
+ 
+         //add the newbies
+         int newCount = 0;
+-        ulong maxId = m_lastTweet;
++        qulonglong maxId = m_lastTweet;
+         foreach (const QString &id, data.keys()) {
+-            ulong i = id.toULong();
++            qulonglong i = id.toULong();
+             //kDebug() << i << m_lastTweet;
+             if (i > m_lastTweet) {
+                 newCount++;
+@@ -464,7 +464,7 @@
+     // Add more tweetWidgets if there are not enough
+ 
+     if (m_tweetMap.count() > m_historySize) {
+-        QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
++        QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.begin();
+         while (it != m_tweetMap.end() && m_tweetMap.count() > m_historySize) {
+             it = m_tweetMap.erase(it);
+         }
+@@ -521,7 +521,7 @@
+     }
+ 
+     int i = 0;
+-    QMap<ulong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
++    QMap<qulonglong, Plasma::DataEngine::Data>::iterator it = m_tweetMap.end();
+     while (it != m_tweetMap.begin()) {
+         Plasma::DataEngine::Data &tweetData = *(--it);
+         QString user = tweetData.value("User").toString();
+--- kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:44	1033678
++++ kdeplasma-addons/applets/microblog/microblog.h	2009/10/10 18:54:46	1033679
+@@ -162,10 +162,10 @@
+         QString m_curTimeline;
+ 
+         QMap<QString, QPixmap> m_pictureMap;
+-        QMap<ulong, Plasma::DataEngine::Data> m_tweetMap;
++        QMap<qulonglong, Plasma::DataEngine::Data> m_tweetMap;
+         QList<Tweet> m_tweetWidgets;
+ 
+-        ulong m_lastTweet;
++        qulonglong m_lastTweet;
+         KWallet::Wallet *m_wallet;
+         enum WalletWait { None=0, Read, Write };
+         WalletWait m_walletWait;
diff --git a/debian/patches/series b/debian/patches/series
index 0915e16..ce7bdac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
 kubuntu_04_netbook_runners.diff
 kubuntu_05_rememberthemilk_auth_fix.diff
+kubuntu_06_microblog_twitter_id_fix.diff

-- 
KDE Plasma Addons module packaging