Hello community,
here is the log from the commit of package plasma-addons for openSUSE:Factory
checked in at Wed Jun 8 17:35:03 CEST 2011.
--------
--- plasma-addons/plasma-addons.changes 2011-05-06 10:15:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/plasma-addons/plasma-addons.changes 2011-06-03 20:01:38.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jun 3 20:01:35 CEST 2011 - dmueller@suse.de
+
+- update to 4.6.4
+ * Bugfixes over KDE 4.6.3
+ * see http://kde.org/announcements/changelogs/changelog4_6_3to4_6_4.php for details
+
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdeplasma-addons-4.6.3.tar.bz2
New:
----
kdeplasma-addons-4.6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-addons.spec ++++++
--- /var/tmp/diff_new_pack.eGyYaM/_old 2011-06-08 17:34:42.000000000 +0200
+++ /var/tmp/diff_new_pack.eGyYaM/_new 2011-06-08 17:34:42.000000000 +0200
@@ -38,7 +38,7 @@
Group: System/GUI/KDE
Summary: Additional Plasma Widgets
Url: http://www.kde.org/
-Version: 4.6.3
+Version: 4.6.4
Release: 1
Source0: kdeplasma-addons-%{version}.tar.bz2
Patch0: 4_6_BRANCH.diff
++++++ kdeplasma-addons-4.6.3.tar.bz2 -> kdeplasma-addons-4.6.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/applets/bookmarks/plasma-applet-bookmarks.desktop new/kdeplasma-addons-4.6.4/applets/bookmarks/plasma-applet-bookmarks.desktop
--- old/kdeplasma-addons-4.6.3/applets/bookmarks/plasma-applet-bookmarks.desktop 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/applets/bookmarks/plasma-applet-bookmarks.desktop 2011-06-03 20:00:49.000000000 +0200
@@ -13,7 +13,7 @@
Name[et]=Järjehoidjad
Name[eu]=Liburu markak
Name[fi]=Kirjanmerkit
-Name[fr]=Favoris
+Name[fr]=Signets
Name[ga]=Leabharmharcanna
Name[hr]=Oznake
Name[hu]=Könyvjelzők
@@ -59,7 +59,7 @@
Comment[et]=Kiire ligipääs järjehoidjatele
Comment[eu]=Liburu marketara sarbide azkarra
Comment[fi]=Nopea pääsy kirjanmerkkeihin
-Comment[fr]=Accès rapide aux favoris
+Comment[fr]=Accès rapide aux signets
Comment[hr]=Brzi pristup oznakama
Comment[hu]=Gyors hozzáférés a könyvjelzőkhöz
Comment[it]=Accesso rapido ai segnalibri
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/applets/rememberthemilk/taskmodel.cpp new/kdeplasma-addons-4.6.4/applets/rememberthemilk/taskmodel.cpp
--- old/kdeplasma-addons-4.6.3/applets/rememberthemilk/taskmodel.cpp 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/applets/rememberthemilk/taskmodel.cpp 2011-06-03 20:00:49.000000000 +0200
@@ -238,12 +238,13 @@
void TaskModel::listUpdate(qulonglong listId)
{
- if (m_listItems.contains(listId)) {
- foreach(const qulonglong &taskid, m_listItems.value(listId)->tasks) {
- engine->connectSource("Task:" + QString::number(taskid), this);
- }
+ if (!m_listItems.contains(listId)) {
+ engine->connectSource("List:" + QString::number(listId), this);
+ }
+
+ foreach(const qulonglong &taskid, m_listItems.value(listId)->tasks) {
+ engine->connectSource("Task:" + QString::number(taskid), this);
}
- else engine->connectSource("List:" + QString::number(listId), this);
}
void TaskModel::switchToList(qulonglong listId) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/dataengines/rememberthemilk/rtmengine.cpp new/kdeplasma-addons-4.6.4/dataengines/rememberthemilk/rtmengine.cpp
--- old/kdeplasma-addons-4.6.3/dataengines/rememberthemilk/rtmengine.cpp 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/dataengines/rememberthemilk/rtmengine.cpp 2011-06-03 20:00:49.000000000 +0200
@@ -117,8 +117,8 @@
return true;
}
else if (source.startsWith("Lists")) {
- ListsSource *listssoruce = static_cast(containerForSource(source));
- listssoruce->refresh();
+ ListsSource *listssource = static_cast(containerForSource(source));
+ listssource->refresh();
return true;
}
else if (source.startsWith("Tasks")) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/request.cpp new/kdeplasma-addons-4.6.4/libs/rtm/request.cpp
--- old/kdeplasma-addons-4.6.3/libs/rtm/request.cpp 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/request.cpp 2011-06-03 20:00:49.000000000 +0200
@@ -33,7 +33,8 @@
const int RTM::Request::MAX_RETRIES = 10;
RTM::Request::Request(const QString &method, const QString &apiKey, const QString &sharedSecret)
- : currentJob(0)
+ : m_readOnly(true),
+ currentJob(0)
{
arguments.insert("method", method);
this->sharedSecret = sharedSecret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/request.h new/kdeplasma-addons-4.6.4/libs/rtm/request.h
--- old/kdeplasma-addons-4.6.3/libs/rtm/request.h 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/request.h 2011-06-03 20:00:49.000000000 +0200
@@ -44,6 +44,9 @@
QString response() const { return m_response; }
RTM::State state() const { return m_state; }
+ void setReadOnly(bool readOnly) { m_readOnly = readOnly; }
+ bool readOnly() const { return m_readOnly; }
+
virtual QString requestUrl(); // Conveniance
QString method() const;
@@ -67,6 +70,8 @@
QString m_response;
int retries;
static const int MAX_RETRIES;
+ bool m_readOnly;
+
RTM::State m_state;
QString sharedSecret;
KIO::TransferJob* currentJob;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/session.cpp new/kdeplasma-addons-4.6.4/libs/rtm/session.cpp
--- old/kdeplasma-addons-4.6.3/libs/rtm/session.cpp 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/session.cpp 2011-06-03 20:00:49.000000000 +0200
@@ -209,7 +209,7 @@
RTM::Request *allTasks = request("rtm.tasks.getList");
if (d->lastRefresh.isValid())
allTasks->addArgument("last_sync", d->lastRefresh.toUTC().toString(Qt::ISODate));
- connectTaskRequest(allTasks);
+ allTasks->setReadOnly(false);
allTasks->sendRequest();
}
@@ -277,8 +277,8 @@
if (list && !list->isSmart())
newTask->addArgument("list_id", QString::number(listId));
newTask->addArgument("timeline", QString::number(getTimeline()));
-
- connectTaskRequest(newTask);
+ newTask->setReadOnly(false);
+
newTask->sendRequest();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/session_p.h new/kdeplasma-addons-4.6.4/libs/rtm/session_p.h
--- old/kdeplasma-addons-4.6.3/libs/rtm/session_p.h 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/session_p.h 2011-06-03 20:00:49.000000000 +0200
@@ -49,7 +49,9 @@
SessionPrivate(Session *parent)
: q(parent),
auth(0),
- online(true)
+ online(true),
+ tasksChanged(false),
+ listsChanged(false)
{
QObject::connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)), q, SLOT(networkStatusChanged(Solid::Networking::Status)));
if (Solid::Networking::status() == Solid::Networking::Unconnected) {
@@ -110,7 +112,7 @@
// We do this next bit manually so it doesn't get auto-connected to taskUpdate()
RTM::Request *smartListRequest = new RTM::Request("rtm.tasks.getList", q->apiKey(), q->sharedSecret());
smartListRequest->addArgument("auth_token", q->token());
- smartListRequest->addArgument("rtm_internal_list_id", QString::number(list->id()));
+ smartListRequest->addArgument("list_id", QString::number(list->id()));
smartListRequest->addArgument("filter", list->filter());
QObject::connect(smartListRequest, SIGNAL(replyReceived(RTM::Request*)), q, SLOT(smartListReply(RTM::Request*)));
@@ -118,37 +120,107 @@
smartListRequest->sendRequest();
}
+ void updateSmartLists() {
+ if (!online)
+ return;
+
+ foreach (RTM::List* list, lists) {
+ if (list->isSmart()) {
+ populateSmartList(list);
+ }
+ }
+ }
+
void taskUpdate(RTM::Request* reply) {
TasksReader reader(reply, q);
reader.read();
lastRefresh = QDateTime::currentDateTime();
reply->deleteLater();
+ applyTaskChanges();
+ if (!reply->readOnly()) {
+ updateSmartLists();
+ } else {
+ completeTaskChanges();
+ }
}
void listUpdate(RTM::Request* reply) {
TasksReader reader(reply, q);
reader.read();
reply->deleteLater();
+ applyListChanges();
+ if (reply->readOnly()) {
+ completeListChanges();
+ }
+ }
+
+ void applyTaskChanges() {
+ foreach(RTM::Task* task, changedTasks) {
+ emit q->taskChanged(task);
+ }
+
+ if (changedTasks.count() > 0) {
+ tasksChanged = true;
+ }
+
+ changedTasks.clear();
+ }
+
+ void completeTaskChanges() {
+ if (tasksChanged) {
+ emit q->tasksChanged();
+ }
+
+ tasksChanged = false;
+ }
+
+ void applyListChanges() {
+ foreach(RTM::List* list, changedLists) {
+ emit q->listChanged(list);
+ }
+
+ if (changedLists.count() > 0) {
+ listsChanged = true;
+ }
+
+ changedLists.clear();
+ }
+
+ void completeListChanges() {
+ if (listsChanged) {
+ emit q->listsChanged();
+ }
+
+ listsChanged = false;
+ }
+
+ void applyChanges() {
+ applyTaskChanges();
+ completeTaskChanges();
+ applyListChanges();
+ completeListChanges();
}
void smartListReply(RTM::Request* reply) {
QStringList parts = reply->requestUrl().split("&");
RTM::ListId id = 0;
foreach(const QString &part, parts)
- if (part.contains("rtm_internal_list_id"))
+ if (part.contains("list_id"))
id = part.split("=").last().toLongLong();
kDebug() << id;
TasksReader reader(reply, q);
reader.read();
RTM::List* list = lists.value(id);
- foreach(RTM::Task* task, reader.readTasks()) {
- list->tasks.insert(task->id(), task);
+ if (list) {
+ list->tasks.clear();
+ foreach(RTM::Task* task, changedTasks) {
+ list->tasks.insert(task->id(), task);
+ }
+ changedLists.push_back(list);
}
+ applyChanges();
- emit q->listChanged(list);
- emit q->listsChanged();
-
reply->deleteLater();
}
void settingsReply(RTM::Request* request) {
@@ -200,6 +272,12 @@
QHashRTM::TaskId,RTM::Task* tasks;
QHashRTM::ListId,RTM::List* lists;
+
+ QListRTM::Task* changedTasks;
+ QListRTM::List* changedLists;
+
+ bool tasksChanged;
+ bool listsChanged;
};
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/task_p.h new/kdeplasma-addons-4.6.4/libs/rtm/task_p.h
--- old/kdeplasma-addons-4.6.3/libs/rtm/task_p.h 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/task_p.h 2011-06-03 20:00:49.000000000 +0200
@@ -40,6 +40,7 @@
request->addArgument("list_id", QString::number(listId));
request->addArgument("taskseries_id", QString::number(seriesId));
request->addArgument("task_id", QString::number(taskId));
+ request->setReadOnly(false);
return request;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/xmlreaders.cpp new/kdeplasma-addons-4.6.4/libs/rtm/xmlreaders.cpp
--- old/kdeplasma-addons-4.6.3/libs/rtm/xmlreaders.cpp 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/xmlreaders.cpp 2011-06-03 20:00:49.000000000 +0200
@@ -54,14 +54,6 @@
request->seek(0);
}
-QList< RTM::List* > RTM::TasksReader::readLists() const {
- return changedLists;
-}
-
-QList< RTM::Task* > RTM::TasksReader::readTasks() const {
- return changedTasks;
-}
-
QDateTime RTM::TasksReader::parseDateTime(const QString& datetime)
{
@@ -91,16 +83,6 @@
}
}
- foreach(RTM::Task* task, changedTasks)
- emit session->taskChanged(task);
- foreach(RTM::List* list, changedLists)
- emit session->listChanged(list);
-
- if (changedTasks.count() > 0)
- emit session->tasksChanged();
- if (changedLists.count() > 0)
- emit session->listsChanged();
-
this->device()->close();
return true; // !error();
}
@@ -192,14 +174,14 @@
list->setName(attributes().value("name").toString());
list->setSmart(attributes().value("smart").toString() == "1" ? true : false);
- changedLists.append(list);
+ if (!session->d->changedLists.contains(list)) {
+ session->d->changedLists.append(list);
+ }
while (!atEnd()) {
readNext();
if (isEndElement()) {
session->d->lists.insert(list->id(), list);
- if (list->isSmart())
- session->d->populateSmartList(list);
return;
}
if (isStartElement()) {
@@ -297,8 +279,13 @@
if (!list)
list = session->newBlankList(props->listId);
- changedTasks.append(task);
- changedLists.append(list);
+ if (!session->d->changedTasks.contains(task)) {
+ session->d->changedTasks.append(task);
+ }
+
+ if (!session->d->changedLists.contains(list)) {
+ session->d->changedLists.append(list);
+ }
// Grab ID
task->d->taskId = attributes().value("id").toString().toULong();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.6.3/libs/rtm/xmlreaders.h new/kdeplasma-addons-4.6.4/libs/rtm/xmlreaders.h
--- old/kdeplasma-addons-4.6.3/libs/rtm/xmlreaders.h 2011-05-06 10:14:05.000000000 +0200
+++ new/kdeplasma-addons-4.6.4/libs/rtm/xmlreaders.h 2011-06-03 20:00:49.000000000 +0200
@@ -41,8 +41,6 @@
TasksReader(RTM::Request *request, RTM::Session *session);
bool read();
- QListRTM::List* readLists() const;
- QListRTM::Task* readTasks() const;
private:
Session * const session;
@@ -66,9 +64,6 @@
void readListsHeader();
void readList();
void readFilter(RTM::List* list);
-
- QListRTM::Task* changedTasks;
- QListRTM::List* changedLists;
};
} // Namespace RTM
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org