rpms/kdeplasma-addons/devel kdeplasma-addons-4.3.2-microblog_twitter.patch, NONE, 1.1 kdeplasma-addons.spec, 1.65, 1.66

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11709

Modified Files:
	kdeplasma-addons.spec 
Added Files:
	kdeplasma-addons-4.3.2-microblog_twitter.patch 
Log Message:
* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
- 4.3.2


kdeplasma-addons-4.3.2-microblog_twitter.patch:
 microblog.cpp |    8 ++++----
 microblog.h   |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE kdeplasma-addons-4.3.2-microblog_twitter.patch ---
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/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();
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.h	2009/09/29 17:15:46	1029410
+++ branches/KDE/4.3/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;


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/devel/kdeplasma-addons.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- kdeplasma-addons.spec	7 Oct 2009 09:21:48 -0000	1.65
+++ kdeplasma-addons.spec	10 Oct 2009 20:22:06 -0000	1.66
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -15,8 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
 
 ## upstream patches
-# https://bugzilla.redhat.com/526524
-# Backported from 4.3 branch
+Patch100: kdeplasma-addons-4.3.2-microblog_twitter.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  eigen2-devel
@@ -81,6 +80,7 @@ Files for developing applications using 
 %setup -q -n kdeplasma-addons-%{version}
 
 %patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
+%patch100 -p4 -b .microblog_twitter
 
 
 %build