[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Aug 1 09:05:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=46ec516
The following commit has been merged in the master branch:
commit 46ec516cc1e641aa621ecb4ed3bc38a83c74414f
Author: Jonathan Riddell <jriddell at canonical.com>
Date: Fri Jun 18 13:15:08 2010 +0100
Update kubuntu_02_microblog_default_configuration.diff from Michał
Zając
---
debian/changelog | 7 +
...kubuntu_02_microblog_default_configuration.diff | 210 ++++++++++-----------
debian/patches/series | 2 +-
3 files changed, 104 insertions(+), 115 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b7db23b..2c6cf58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.4.85-0ubuntu3) maverick; urgency=low
+
+ * Update kubuntu_02_microblog_default_configuration.diff from Michał
+ Zając
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 18 Jun 2010 13:14:03 +0100
+
kdeplasma-addons (4:4.4.85-0ubuntu2) maverick; urgency=low
* Rebuild for libplasmaclock4a -> libplasmaclock4b transition
diff --git a/debian/patches/kubuntu_02_microblog_default_configuration.diff b/debian/patches/kubuntu_02_microblog_default_configuration.diff
index cc8618b..934c57b 100644
--- a/debian/patches/kubuntu_02_microblog_default_configuration.diff
+++ b/debian/patches/kubuntu_02_microblog_default_configuration.diff
@@ -1,42 +1,26 @@
-Index: kdeplasma-addons-4.3.2/applets/microblog/microblog.cpp
+Index: kdeplasma-addons-4.4.85/applets/microblog/microblog.cpp
===================================================================
---- kdeplasma-addons-4.3.2.orig/applets/microblog/microblog.cpp 2009-10-02 10:22:02.000000000 +0200
-+++ kdeplasma-addons-4.3.2/applets/microblog/microblog.cpp 2009-11-15 16:29:29.452845426 +0100
-@@ -32,6 +32,7 @@
- #include <QGraphicsProxyWidget>
+--- kdeplasma-addons-4.4.85.orig/applets/microblog/microblog.cpp 2010-05-27 18:24:02.000000000 +0100
++++ kdeplasma-addons-4.4.85/applets/microblog/microblog.cpp 2010-06-18 12:37:25.603694858 +0100
+@@ -27,6 +27,8 @@
+ #include <QGraphicsAnchorLayout>
#include <QAction>
- #include <QLabel>
+ #include <QTimer>
+#include <QFile>
++
#include <KColorScheme>
#include <KConfigDialog>
-@@ -172,7 +173,7 @@
+@@ -164,7 +166,7 @@
m_serviceUrl = cg.readEntry("serviceUrl", "https://identi.ca/api/");
m_username = cg.readEntry("username");
m_password = KStringHandler::obscure(cg.readEntry("password"));
-- m_historySize = cg.readEntry("historySize", 2);
+- m_historySize = cg.readEntry("historySize", 6);
+ m_historySize = cg.readEntry("historySize", 10);
m_historyRefresh = cg.readEntry("historyRefresh", 5);
m_includeFriends = cg.readEntry("includeFriends", true);
-@@ -210,12 +211,12 @@
-
- m_layout->addItem(flashLayout);
-
-- Plasma::Frame *headerFrame = new Plasma::Frame(this);
-- m_headerLayout = new QGraphicsLinearLayout( Qt::Horizontal, headerFrame );
-+ m_headerFrame = new Plasma::Frame(this);
-+ m_headerLayout = new QGraphicsLinearLayout( Qt::Horizontal, m_headerFrame );
- m_headerLayout->setContentsMargins( 5, 5, 5, 10 );
- m_headerLayout->setSpacing( 5 );
-- m_layout->addItem( headerFrame );
--
-+
-+ m_layout->addItem( m_headerFrame );
-
- m_icon = new Plasma::IconWidget(this);
- m_icon->setIcon(KIcon("user-identity"));
-@@ -259,6 +260,7 @@
+@@ -261,6 +263,7 @@
//set things in motion
if (m_username.isEmpty()) {
setAuthRequired(true);
@@ -44,166 +28,164 @@ Index: kdeplasma-addons-4.3.2/applets/microblog/microblog.cpp
} else if (m_password.isEmpty()) {
kDebug() << "started, password is not in config file, trying wallet";
m_walletWait = Read;
-@@ -325,7 +327,9 @@
+@@ -351,7 +354,9 @@
} else if (m_password.isEmpty()) {
//FIXME: when out of string freeze, tell the user WHY they need
// to configure the widget;
- setConfigurationRequired(true);
+ if (!QFile::exists("/usr/bin/ubiquity")) { //don't show on live CD
-+ setConfigurationRequired(true);
++ setConfigurationRequired(true);
+ }
kDebug() << "failed to read password";
}
-@@ -350,7 +354,9 @@
+@@ -376,7 +381,9 @@
void MicroBlog::setAuthRequired(bool required)
{
- setConfigurationRequired(required);
+ if (!QFile::exists("/usr/bin/ubiquity")) {
-+ setConfigurationRequired(required);
++ setConfigurationRequired(required);
+ }
m_statusEdit->setEnabled(!required);
}
-@@ -776,17 +782,25 @@
+@@ -760,12 +767,20 @@
+ void MicroBlog::downloadHistory()
{
//kDebug() ;
- if (m_username.isEmpty() || m_password.isEmpty()) {
-+ /*
+- if (m_username.isEmpty() || m_password.isEmpty()) {
++
++ if (m_username.isEmpty() || m_password.isEmpty()) {
++ /*
if (!m_curTimeline.isEmpty()) {
m_engine->disconnectSource(m_curTimeline, this);
m_engine->disconnectSource("Error:" + m_curTimeline, this);
}
return;
-+ */
-+ m_username = "kubuntu"; //default to show when unconfigured
-+ m_headerFrame->hide();
-+ } else {
-+ m_headerFrame->show();
++ */
++
++ m_username = "kubuntu"; //default to show when unconfigured
++ m_headerFrame->hide();
++ } else {
++ m_headerFrame->show();
}
m_flash->flash(i18n("Refreshing timeline..."), -1);
-
- QString query;
-- if (m_includeFriends) {
-+ if (m_password.isEmpty()) {
-+ query = QString("NoAuth:%1@%2");
-+ } else if (m_includeFriends) {
- query = QString("TimelineWithFriends:%1@%2");
- } else {
- query = QString("Timeline:%1@%2");
-@@ -818,7 +832,9 @@
- m_service = m_engine->serviceForSource(m_curTimeline);
- connect(m_service, SIGNAL(finished(Plasma::ServiceJob*)), this, SLOT(serviceFinished(Plasma::ServiceJob*)));
- KConfigGroup cg = m_service->operationDescription("auth");
-- cg.writeEntry("password", m_password);
-+ if (!m_password.isEmpty()) {
-+ cg.writeEntry("password", m_password);
-+ }
- m_service->startOperationCall(cg);
-
- //get the profile to retrieve the user icon
-Index: kdeplasma-addons-4.3.2/applets/microblog/microblog.h
-===================================================================
---- kdeplasma-addons-4.3.2.orig/applets/microblog/microblog.h 2009-10-02 10:22:02.000000000 +0200
-+++ kdeplasma-addons-4.3.2/applets/microblog/microblog.h 2009-11-15 16:28:44.128846924 +0100
-@@ -142,6 +142,7 @@
- QGraphicsLinearLayout *m_tweetsLayout;
- QGraphicsLinearLayout *m_layout;
- QGraphicsLinearLayout *m_headerLayout;
-+ Plasma::Frame *m_headerFrame;
- QGraphicsWidget *m_graphicsWidget;
- QPixmap m_popupIcon;
-
-Index: kdeplasma-addons-4.3.2/dataengines/microblog/timelinesource.cpp
+@@ -778,7 +793,9 @@
+
+ if (m_service) {
+ KConfigGroup cg = m_service->operationDescription("auth");
+- cg.writeEntry("password", m_password);
++ if (!m_password.isEmpty()) {
++ cg.writeEntry("password", m_password);
++ }
+ m_service->startOperationCall(cg);
+ }
+ }
+@@ -818,8 +835,10 @@
+ query = "Replies:%1@%2";
+ break;
+ default:
+- if(m_includeFriends) {
+- query = QString("TimelineWithFriends:%1@%2");
++ if (m_password.isEmpty()) {
++ query = QString("NoAuth:%1@%2");
++ } else if (m_includeFriends) {
++ query = QString("TimelineWithFriends:%1@%2");
+ } else {
+ query = QString("Timeline:%1@%2");
+ }
+Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.cpp
===================================================================
---- kdeplasma-addons-4.3.2.orig/dataengines/microblog/timelinesource.cpp 2009-05-06 12:14:08.000000000 +0200
-+++ kdeplasma-addons-4.3.2/dataengines/microblog/timelinesource.cpp 2009-11-15 16:28:44.132845827 +0100
-@@ -91,6 +91,9 @@
+--- kdeplasma-addons-4.4.85.orig/dataengines/microblog/timelinesource.cpp 2010-05-27 18:23:58.000000000 +0100
++++ kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.cpp 2010-06-18 12:35:49.156693793 +0100
+@@ -97,6 +97,9 @@
case TimelineWithFriends:
m_url = KUrl(m_serviceBaseUrl, "statuses/friends_timeline.xml");
break;
+ case NoAuth:
-+ m_url = KUrl(m_serviceBaseUrl, QString("statuses/user_timeline/%1.xml").arg(account.at(0)));
++ m_url = KUrl(m_serviceBaseUrl, QString("statuses/user_timeline/%1.xml").arg(account.at(0)));
+ break;
case Timeline:
default:
m_url = KUrl(m_serviceBaseUrl, "statuses/user_timeline.xml");
-@@ -134,7 +137,7 @@
+@@ -141,7 +144,7 @@
- void TimelineSource::update()
+ void TimelineSource::update(bool forcedUpdate)
{
- if (m_job || (!account().isEmpty() && password().isEmpty())) {
+ 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();
+ //kDebug() << "already updating....." << m_job << account().isEmpty() << password().isEmpty();
return;
-Index: kdeplasma-addons-4.3.2/dataengines/microblog/timelinesource.h
+Index: kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.h
===================================================================
---- kdeplasma-addons-4.3.2.orig/dataengines/microblog/timelinesource.h 2009-02-04 19:19:46.000000000 +0100
-+++ kdeplasma-addons-4.3.2/dataengines/microblog/timelinesource.h 2009-11-15 16:28:44.132845827 +0100
-@@ -78,7 +78,8 @@
- enum RequestType {
- Timeline = 0,
+--- kdeplasma-addons-4.4.85.orig/dataengines/microblog/timelinesource.h 2009-08-12 11:00:01.000000000 +0100
++++ kdeplasma-addons-4.4.85/dataengines/microblog/timelinesource.h 2010-06-18 12:35:49.156693793 +0100
+@@ -80,7 +80,8 @@
TimelineWithFriends,
+ Replies,
+ DirectMessages,
- Profile
+ Profile,
+ NoAuth
};
TimelineSource(const QString &who, RequestType requestType, QObject* parent);
-Index: kdeplasma-addons-4.3.2/dataengines/microblog/twitterengine.cpp
+Index: kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.cpp
===================================================================
---- kdeplasma-addons-4.3.2.orig/dataengines/microblog/twitterengine.cpp 2009-02-04 19:19:46.000000000 +0100
-+++ kdeplasma-addons-4.3.2/dataengines/microblog/twitterengine.cpp 2009-11-15 16:28:44.132845827 +0100
-@@ -37,6 +37,7 @@
+--- kdeplasma-addons-4.4.85.orig/dataengines/microblog/twitterengine.cpp 2009-08-12 11:00:01.000000000 +0100
++++ kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.cpp 2010-06-18 12:35:49.156693793 +0100
+@@ -30,6 +30,7 @@
const QString TwitterEngine::timelinePrefix("Timeline:");
const QString TwitterEngine::timelineWithFriendsPrefix("TimelineWithFriends:");
const QString TwitterEngine::profilePrefix("Profile:");
+const QString TwitterEngine::noauthPrefix("NoAuth:");
+ const QString TwitterEngine::repliesPrefix("Replies:");
+ const QString TwitterEngine::messagesPrefix("Messages:");
- TwitterEngine::TwitterEngine(QObject* parent, const QVariantList& args)
- : Plasma::DataEngine(parent, args)
-@@ -56,7 +57,7 @@
- return true;
- }
+@@ -53,7 +54,7 @@
-- if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix)) {
-+ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix) && !name.startsWith(noauthPrefix)) {
+ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix)
+ && !name.startsWith(profilePrefix) && !name.startsWith(repliesPrefix)
+- && !name.startsWith(messagesPrefix)) {
++ && !name.startsWith(messagesPrefix) && !name.startsWith(noauthPrefix)) {
return false;
}
-@@ -84,9 +85,8 @@
- //always returns false becaues everything is async
+@@ -81,11 +82,10 @@
+ //always returns false because everything is async
bool TwitterEngine::updateSourceEvent(const QString &name)
{
- //kDebug() << name;
//right now it only makes sense to do an update on timelines
-- if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix)) {
-+ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix) && !name.startsWith(profilePrefix) && !name.startsWith(noauthPrefix)) {
+ if (!name.startsWith(timelinePrefix) && !name.startsWith(timelineWithFriendsPrefix)
+ && !name.startsWith(profilePrefix) && !name.startsWith(repliesPrefix)
+- && !name.startsWith(messagesPrefix)) {
++ && !name.startsWith(messagesPrefix) && !name.startsWith(noauthPrefix)) {
return false;
}
-@@ -99,6 +99,9 @@
+@@ -98,6 +98,9 @@
} else if (name.startsWith(profilePrefix)) {
requestType = TimelineSource::Profile;
who.remove(profilePrefix);
+ } else if (name.startsWith(noauthPrefix)) {
-+ requestType = TimelineSource::NoAuth;
-+ who.remove(noauthPrefix);
- }else{
- requestType = TimelineSource::Timeline;
- who.remove(timelinePrefix);
-Index: kdeplasma-addons-4.3.2/dataengines/microblog/twitterengine.h
++ requestType = TimelineSource::NoAuth;
++ who.remove(noauthPrefix);
+ } else if (name.startsWith(repliesPrefix)) {
+ requestType = TimelineSource::Replies;
+ who.remove(repliesPrefix);
+Index: kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.h
===================================================================
---- kdeplasma-addons-4.3.2.orig/dataengines/microblog/twitterengine.h 2009-04-30 20:02:33.000000000 +0200
-+++ kdeplasma-addons-4.3.2/dataengines/microblog/twitterengine.h 2009-11-15 16:28:44.132845827 +0100
-@@ -70,6 +70,7 @@
- static const QString timelinePrefix;
- static const QString timelineWithFriendsPrefix;
- static const QString profilePrefix;
+--- kdeplasma-addons-4.4.85.orig/dataengines/microblog/twitterengine.h 2009-08-12 11:00:01.000000000 +0100
++++ kdeplasma-addons-4.4.85/dataengines/microblog/twitterengine.h 2010-06-18 12:35:49.160692396 +0100
+@@ -67,6 +67,7 @@
+ static const QString timelinePrefix;
+ static const QString timelineWithFriendsPrefix;
+ static const QString profilePrefix;
+ static const QString noauthPrefix;
+ static const QString repliesPrefix;
+ static const QString messagesPrefix;
ImageSource *m_imageSource;
-
- };
diff --git a/debian/patches/series b/debian/patches/series
index bcc3ce0..9ff4697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-#kubuntu_02_microblog_default_configuration.diff
+kubuntu_02_microblog_default_configuration.diff
#kubuntu_03_opendestop_setup.diff
kubuntu_04_kimpanel_disable_scim.diff
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list