[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:24 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=9f04f88
The following commit has been merged in the master branch:
commit 9f04f88793e3bebe035c1dbfe1feb10dc9071681
Author: Jonathan Riddell <jriddell at canonical.com>
Date: Tue Mar 29 12:29:41 2011 +0100
Update kubuntu_02_microblog_default_configuration.diff
---
debian/changelog | 6 ++
...kubuntu_02_microblog_default_configuration.diff | 111 ++++++++++-----------
debian/patches/series | 2 +-
3 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c76d39e..2edaa13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdeplasma-addons (4:4.6.1-0ubuntu2) UNRELEASED; urgency=low
+
+ * Update kubuntu_02_microblog_default_configuration.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 29 Mar 2011 12:29:18 +0100
+
kdeplasma-addons (4:4.6.1-0ubuntu1) natty; 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 ff3763c..64a9167 100644
--- a/debian/patches/kubuntu_02_microblog_default_configuration.diff
+++ b/debian/patches/kubuntu_02_microblog_default_configuration.diff
@@ -1,7 +1,7 @@
-Index: kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp
+Index: kdeplasma-addons-4.6.1/applets/microblog/microblog.cpp
===================================================================
---- kdeplasma-addons-4.4.90.orig/applets/microblog/microblog.cpp 2010-05-27 19:24:02.000000000 +0200
-+++ kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp 2010-06-26 00:08:46.530645529 +0200
+--- kdeplasma-addons-4.6.1.orig/applets/microblog/microblog.cpp 2011-02-25 22:49:51.000000000 +0000
++++ kdeplasma-addons-4.6.1/applets/microblog/microblog.cpp 2011-03-29 11:58:13.638063960 +0100
@@ -27,6 +27,8 @@
#include <QGraphicsAnchorLayout>
#include <QAction>
@@ -11,68 +11,65 @@ Index: kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp
#include <KColorScheme>
#include <KConfigDialog>
-@@ -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", 6);
-+ m_historySize = cg.readEntry("historySize", 10);
- m_historyRefresh = cg.readEntry("historyRefresh", 5);
- m_includeFriends = cg.readEntry("includeFriends", true);
+@@ -264,7 +266,7 @@
+ QString serviceUrl = cg.readEntry("serviceUrl", "https://identi.ca/api/");
+ QString username = cg.readEntry("username");
+ QString password = KStringHandler::obscure(cg.readEntry("password"));
+- int historySize = cg.readEntry("historySize", 6);
++ int historySize = cg.readEntry("historySize", 10);
+ int historyRefresh = cg.readEntry("historyRefresh", 5);
+ bool includeFriends = cg.readEntry("includeFriends", true);
+ bool changed = false;
+@@ -339,6 +341,7 @@
-@@ -261,6 +263,7 @@
- //set things in motion
if (m_username.isEmpty()) {
setAuthRequired(true);
+ downloadHistory();
} else if (m_password.isEmpty()) {
- kDebug() << "started, password is not in config file, trying wallet";
+ //kDebug() << "started, password is not in config file, trying wallet";
m_walletWait = Read;
-@@ -351,7 +354,9 @@
- } else if (m_password.isEmpty()) {
- //FIXME: when out of string freeze, tell the user WHY they need
+@@ -468,7 +471,9 @@
// to configure the widget;
-- setConfigurationRequired(true);
-+ if (!QFile::exists("/usr/bin/ubiquity")) { //don't show on live CD
-+ setConfigurationRequired(true);
-+ }
- kDebug() << "failed to read password";
- }
-
-@@ -376,7 +381,9 @@
+ m_password = KStringHandler::obscure(config().readEntry("password"));
+ if(m_password.isEmpty()){
+- setConfigurationRequired(true, i18n("Your password is required."));
++ if (!QFile::exists("/usr/bin/ubiquity")) { //don't show on live CD
++ setConfigurationRequired(true, i18n("Your password is required."));
++ }
+ }else{
+ //kDebug() << "reading from config";
+ //kDebug() << "failed to read password";
+@@ -497,7 +502,9 @@
void MicroBlog::setAuthRequired(bool required)
{
-- setConfigurationRequired(required);
+- setConfigurationRequired(required, i18n("Your account information is incomplete."));
+ if (!QFile::exists("/usr/bin/ubiquity")) {
-+ setConfigurationRequired(required);
++ setConfigurationRequired(required, i18n("Your account information is incomplete."));
+ }
- m_statusEdit->setEnabled(!required);
- }
-
-@@ -760,12 +767,20 @@
- void MicroBlog::downloadHistory()
+ if (m_graphicsWidget) {
+ m_statusEdit->setEnabled(!required);
+ }
+@@ -820,12 +827,18 @@
{
- //kDebug() ;
-- if (m_username.isEmpty() || m_password.isEmpty()) {
-+
-+ if (m_username.isEmpty() || m_password.isEmpty()) {
-+ /*
+ // kDebug() << "Inside downloadhistory";
+ if (m_username.isEmpty() || m_password.isEmpty()) {
++ /*
+ //kDebug() << "BOOHYA got empty password";
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 {
++ } else {
+ m_headerFrame->show();
}
m_flash->flash(i18n("Refreshing timeline..."), -1);
-@@ -778,7 +793,9 @@
+@@ -838,7 +851,9 @@
if (m_service) {
KConfigGroup cg = m_service->operationDescription("auth");
@@ -83,7 +80,7 @@ Index: kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp
m_service->startOperationCall(cg);
}
}
-@@ -818,8 +835,10 @@
+@@ -878,8 +893,10 @@
query = "Replies:%1@%2";
break;
default:
@@ -96,11 +93,11 @@ Index: kdeplasma-addons-4.4.90/applets/microblog/microblog.cpp
} else {
query = QString("Timeline:%1@%2");
}
-Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp
+Index: kdeplasma-addons-4.6.1/dataengines/microblog/timelinesource.cpp
===================================================================
---- kdeplasma-addons-4.4.90.orig/dataengines/microblog/timelinesource.cpp 2010-06-24 18:32:17.000000000 +0200
-+++ kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp 2010-06-26 00:10:42.942095727 +0200
-@@ -118,6 +118,9 @@
+--- kdeplasma-addons-4.6.1.orig/dataengines/microblog/timelinesource.cpp 2011-02-25 22:49:51.000000000 +0000
++++ kdeplasma-addons-4.6.1/dataengines/microblog/timelinesource.cpp 2011-03-29 11:58:04.738063962 +0100
+@@ -132,6 +132,9 @@
case TimelineWithFriends:
m_url = KUrl(m_serviceBaseUrl, "statuses/friends_timeline.xml");
break;
@@ -110,7 +107,7 @@ Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp
case Timeline:
default:
m_url = KUrl(m_serviceBaseUrl, "statuses/user_timeline.xml");
-@@ -201,7 +204,7 @@
+@@ -216,7 +219,7 @@
void TimelineSource::update(bool forcedUpdate)
{
@@ -119,11 +116,11 @@ Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.cpp
// We are already performing a fetch, let's not bother starting over
//kDebug() << "already updating....." << m_job << account().isEmpty() << password().isEmpty();
return;
-Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.h
+Index: kdeplasma-addons-4.6.1/dataengines/microblog/timelinesource.h
===================================================================
---- kdeplasma-addons-4.4.90.orig/dataengines/microblog/timelinesource.h 2010-06-24 18:32:17.000000000 +0200
-+++ kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.h 2010-06-26 00:08:46.530645529 +0200
-@@ -82,7 +82,8 @@
+--- kdeplasma-addons-4.6.1.orig/dataengines/microblog/timelinesource.h 2011-02-25 22:49:51.000000000 +0000
++++ kdeplasma-addons-4.6.1/dataengines/microblog/timelinesource.h 2011-03-29 11:58:04.778063962 +0100
+@@ -88,7 +88,8 @@
TimelineWithFriends,
Replies,
DirectMessages,
@@ -133,10 +130,10 @@ Index: kdeplasma-addons-4.4.90/dataengines/microblog/timelinesource.h
};
TimelineSource(const QString &who, RequestType requestType, QObject* parent);
-Index: kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.cpp
+Index: kdeplasma-addons-4.6.1/dataengines/microblog/twitterengine.cpp
===================================================================
---- kdeplasma-addons-4.4.90.orig/dataengines/microblog/twitterengine.cpp 2009-08-12 12:00:01.000000000 +0200
-+++ kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.cpp 2010-06-26 00:08:46.530645529 +0200
+--- kdeplasma-addons-4.6.1.orig/dataengines/microblog/twitterengine.cpp 2011-02-25 22:49:36.000000000 +0000
++++ kdeplasma-addons-4.6.1/dataengines/microblog/twitterengine.cpp 2011-03-29 11:58:04.808063962 +0100
@@ -30,6 +30,7 @@
const QString TwitterEngine::timelinePrefix("Timeline:");
const QString TwitterEngine::timelineWithFriendsPrefix("TimelineWithFriends:");
@@ -177,10 +174,10 @@ Index: kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.cpp
} else if (name.startsWith(repliesPrefix)) {
requestType = TimelineSource::Replies;
who.remove(repliesPrefix);
-Index: kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.h
+Index: kdeplasma-addons-4.6.1/dataengines/microblog/twitterengine.h
===================================================================
---- kdeplasma-addons-4.4.90.orig/dataengines/microblog/twitterengine.h 2009-08-12 12:00:01.000000000 +0200
-+++ kdeplasma-addons-4.4.90/dataengines/microblog/twitterengine.h 2010-06-26 00:08:46.530645529 +0200
+--- kdeplasma-addons-4.6.1.orig/dataengines/microblog/twitterengine.h 2011-02-25 22:49:36.000000000 +0000
++++ kdeplasma-addons-4.6.1/dataengines/microblog/twitterengine.h 2011-03-29 11:58:04.808063962 +0100
@@ -67,6 +67,7 @@
static const QString timelinePrefix;
static const QString timelineWithFriendsPrefix;
diff --git a/debian/patches/series b/debian/patches/series
index fc93edc..f02f1d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
kubuntu_04_kimpanel_disable_scim.diff
-#kubuntu_02_microblog_default_configuration.diff
+kubuntu_02_microblog_default_configuration.diff
#kubuntu_03_opendestop_setup.diff
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list