Hello community,
here is the log from the commit of package kupdateapplet for openSUSE:Factory
checked in at Thu Jun 3 14:45:28 CEST 2010.
--------
--- KDE/kupdateapplet/kupdateapplet.changes 2010-05-12 16:24:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/kupdateapplet/kupdateapplet.changes 2010-05-31 10:55:18.000000000 +0200
@@ -1,0 +2,12 @@
+Mon May 31 10:53:42 CEST 2010 - tgoettlicher@suse.de
+
+- Removed signals not provided by PackageKit anymore
+- V 0.9.15
+
+-------------------------------------------------------------------
+Fri May 28 17:19:17 CEST 2010 - tgoettlicher@suse.de
+
+- Adapted to PackageKit API change (bnc #609409)
+- V 0.9.14
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kupdateapplet-0.9.13.tar.bz2
New:
----
kupdateapplet-0.9.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kupdateapplet.spec ++++++
--- /var/tmp/diff_new_pack.gCmL9U/_old 2010-06-03 14:45:21.000000000 +0200
+++ /var/tmp/diff_new_pack.gCmL9U/_new 2010-06-03 14:45:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kupdateapplet (Version 0.9.13)
+# spec file for package kupdateapplet (Version 0.9.15)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,12 +23,12 @@
License: GPL
Group: System/Management
Summary: openSUSE System Updater Applet (KDE4)
-Version: 0.9.13
+Version: 0.9.15
Release: 1
Url: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Requires: kupdateapplet-plugin = 0.9.13
+Requires: kupdateapplet-plugin = 0.9.15
Requires: oxygen-icon-theme
Requires: PolicyKit-kde
Recommends: smolt
@@ -107,7 +107,7 @@
Group: System/Management
Summary: packagekit plugin for KDE updater applet
Requires: PackageKit >= 0.5.1
-Provides: kupdateapplet-plugin = 0.9.13
+Provides: kupdateapplet-plugin = 0.9.15
Provides: kde4-kupdateapplet-packagekit = 0.9.0
Obsoletes: kde4-kupdateapplet-packagekit <= 0.8.42
Recommends: polkit-gnome
@@ -131,7 +131,7 @@
#Group: System/Management
#Summary: zypp plugin for KDE updater applet
#Requires: zypper >= 0.12.11
-#Provides: kupdateapplet-plugin = 0.9.13
+#Provides: kupdateapplet-plugin = 0.9.15
#Provides: kde4-kupdateapplet-zypp = 0.9.0
#Obsoletes: kde4-kupdateapplet-zypp <= 0.8.42
#
++++++ kupdateapplet-0.9.13.tar.bz2 -> kupdateapplet-0.9.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/VERSION.cmake new/kupdateapplet-0.9.15/VERSION.cmake
--- old/kupdateapplet-0.9.13/VERSION.cmake 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/VERSION.cmake 2010-05-31 10:55:00.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "9")
-SET(VERSION_PATCH "13")
+SET(VERSION_PATCH "15")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/package/kupdateapplet.changes new/kupdateapplet-0.9.15/package/kupdateapplet.changes
--- old/kupdateapplet-0.9.13/package/kupdateapplet.changes 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/package/kupdateapplet.changes 2010-05-31 10:54:59.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon May 31 10:53:42 CEST 2010 - tgoettlicher@suse.de
+
+- Removed signals not provided by PackageKit anymore
+- V 0.9.15
+
+-------------------------------------------------------------------
+Fri May 28 17:19:17 CEST 2010 - tgoettlicher@suse.de
+
+- Adapted to PackageKit API change (bnc #609409)
+- V 0.9.14
+
+-------------------------------------------------------------------
Wed May 12 16:22:55 CEST 2010 - tgoettlicher@suse.de
- updated translations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/po/kupdateapplet.pot new/kupdateapplet-0.9.15/po/kupdateapplet.pot
--- old/kupdateapplet-0.9.13/po/kupdateapplet.pot 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/po/kupdateapplet.pot 2010-05-31 10:54:59.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 12:16+0200\n"
+"POT-Creation-Date: 2010-05-28 16:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/src/packagekit/QPackageKitInterface.cpp new/kupdateapplet-0.9.15/src/packagekit/QPackageKitInterface.cpp
--- old/kupdateapplet-0.9.13/src/packagekit/QPackageKitInterface.cpp 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/src/packagekit/QPackageKitInterface.cpp 2010-05-31 10:54:59.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -m -N -p QPackageKitInterface -c QPackageKitInterface /space/git/PackageKit/src/org.freedesktop.PackageKit.xml org.freedesktop.PackageKit
+ * Command line was: qdbusxml2cpp -m -N -p QPackageKitInterface -c QPackageKitInterface /data/PackageKit/src/org.freedesktop.PackageKit.xml org.freedesktop.PackageKit
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/src/packagekit/QPackageKitInterface.h new/kupdateapplet-0.9.15/src/packagekit/QPackageKitInterface.h
--- old/kupdateapplet-0.9.13/src/packagekit/QPackageKitInterface.h 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/src/packagekit/QPackageKitInterface.h 2010-05-31 10:54:59.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -m -N -p QPackageKitInterface -c QPackageKitInterface /space/git/PackageKit/src/org.freedesktop.PackageKit.xml org.freedesktop.PackageKit
+ * Command line was: qdbusxml2cpp -m -N -p QPackageKitInterface -c QPackageKitInterface /data/PackageKit/src/org.freedesktop.PackageKit.xml org.freedesktop.PackageKit
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
@@ -35,26 +35,64 @@
~QPackageKitInterface();
-public Q_SLOTS: // METHODS
- inline QDBusPendingReply<QString> GetActions()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetActions"), argumentList);
- }
+ Q_PROPERTY(QString BackendAuthor READ backendAuthor)
+ inline QString backendAuthor() const
+ { return qvariant_cast< QString >(internalPropGet("BackendAuthor")); }
+
+ Q_PROPERTY(QString BackendDescription READ backendDescription)
+ inline QString backendDescription() const
+ { return qvariant_cast< QString >(internalPropGet("BackendDescription")); }
+
+ Q_PROPERTY(QString BackendName READ backendName)
+ inline QString backendName() const
+ { return qvariant_cast< QString >(internalPropGet("BackendName")); }
+
+ Q_PROPERTY(QString DistroId READ distroId)
+ inline QString distroId() const
+ { return qvariant_cast< QString >(internalPropGet("DistroId")); }
+
+ Q_PROPERTY(QString Filters READ filters)
+ inline QString filters() const
+ { return qvariant_cast< QString >(internalPropGet("Filters")); }
+
+ Q_PROPERTY(QString Groups READ groups)
+ inline QString groups() const
+ { return qvariant_cast< QString >(internalPropGet("Groups")); }
+
+ Q_PROPERTY(bool Locked READ locked)
+ inline bool locked() const
+ { return qvariant_cast< bool >(internalPropGet("Locked")); }
+
+ Q_PROPERTY(QString MimeTypes READ mimeTypes)
+ inline QString mimeTypes() const
+ { return qvariant_cast< QString >(internalPropGet("MimeTypes")); }
+
+ Q_PROPERTY(QString NetworkState READ networkState)
+ inline QString networkState() const
+ { return qvariant_cast< QString >(internalPropGet("NetworkState")); }
+
+ Q_PROPERTY(QString Roles READ roles)
+ inline QString roles() const
+ { return qvariant_cast< QString >(internalPropGet("Roles")); }
+
+ Q_PROPERTY(uint VersionMajor READ versionMajor)
+ inline uint versionMajor() const
+ { return qvariant_cast< uint >(internalPropGet("VersionMajor")); }
+
+ Q_PROPERTY(uint VersionMicro READ versionMicro)
+ inline uint versionMicro() const
+ { return qvariant_cast< uint >(internalPropGet("VersionMicro")); }
+
+ Q_PROPERTY(uint VersionMinor READ versionMinor)
+ inline uint versionMinor() const
+ { return qvariant_cast< uint >(internalPropGet("VersionMinor")); }
- inline QDBusPendingReply GetBackendDetail()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetBackendDetail"), argumentList);
- }
- inline QDBusReply<QString> GetBackendDetail(QString &author)
+public Q_SLOTS: // METHODS
+ inline QDBusPendingReply<QString> CanAuthorize(const QString &action_id)
{
QList<QVariant> argumentList;
- QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetBackendDetail"), argumentList);
- if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
- author = qdbus_cast<QString>(reply.arguments().at(1));
- }
- return reply;
+ argumentList << qVariantFromValue(action_id);
+ return asyncCallWithArgumentList(QLatin1String("CanAuthorize"), argumentList);
}
inline QDBusPendingReply<QString> GetDaemonState()
@@ -63,30 +101,6 @@
return asyncCallWithArgumentList(QLatin1String("GetDaemonState"), argumentList);
}
- inline QDBusPendingReply<QString> GetFilters()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetFilters"), argumentList);
- }
-
- inline QDBusPendingReply<QString> GetGroups()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetGroups"), argumentList);
- }
-
- inline QDBusPendingReply<QString> GetMimeTypes()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetMimeTypes"), argumentList);
- }
-
- inline QDBusPendingReply<QString> GetNetworkState()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetNetworkState"), argumentList);
- }
-
inline QDBusPendingReply<QString> GetTid()
{
QList<QVariant> argumentList;
@@ -113,6 +127,13 @@
return asyncCallWithArgumentList(QLatin1String("SetProxy"), argumentList);
}
+ inline QDBusPendingReply<> SetRoot(const QString &root)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(root);
+ return asyncCallWithArgumentList(QLatin1String("SetRoot"), argumentList);
+ }
+
inline QDBusPendingReply<> StateHasChanged(const QString &reason)
{
QList<QVariant> argumentList;
@@ -127,8 +148,7 @@
}
Q_SIGNALS: // SIGNALS
- void Locked(bool is_locked);
- void NetworkStateChanged(const QString &state);
+ void Changed();
void RepoListChanged();
void RestartSchedule();
void TransactionListChanged(const QStringList &transactions);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/src/packagekit/QPackageKitTransactionInterface.cpp new/kupdateapplet-0.9.15/src/packagekit/QPackageKitTransactionInterface.cpp
--- old/kupdateapplet-0.9.13/src/packagekit/QPackageKitTransactionInterface.cpp 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/src/packagekit/QPackageKitTransactionInterface.cpp 2010-05-31 10:54:59.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -m -N -p QPackageKitTransactionInterface -c QPackageKitTransactionInterface /space/git/PackageKit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
+ * Command line was: qdbusxml2cpp -m -N -p QPackageKitTransactionInterface -c QPackageKitTransactionInterface /data/PackageKit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/src/packagekit/QPackageKitTransactionInterface.h new/kupdateapplet-0.9.15/src/packagekit/QPackageKitTransactionInterface.h
--- old/kupdateapplet-0.9.13/src/packagekit/QPackageKitTransactionInterface.h 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/src/packagekit/QPackageKitTransactionInterface.h 2010-05-31 10:54:59.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -m -N -p QPackageKitTransactionInterface -c QPackageKitTransactionInterface /space/git/PackageKit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
+ * Command line was: qdbusxml2cpp -m -N -p QPackageKitTransactionInterface -c QPackageKitTransactionInterface /data/PackageKit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
*
* qdbusxml2cpp is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
*
@@ -35,6 +35,50 @@
~QPackageKitTransactionInterface();
+ Q_PROPERTY(bool AllowCancel READ allowCancel)
+ inline bool allowCancel() const
+ { return qvariant_cast< bool >(internalPropGet("AllowCancel")); }
+
+ Q_PROPERTY(bool CallerActive READ callerActive)
+ inline bool callerActive() const
+ { return qvariant_cast< bool >(internalPropGet("CallerActive")); }
+
+ Q_PROPERTY(uint ElapsedTime READ elapsedTime)
+ inline uint elapsedTime() const
+ { return qvariant_cast< uint >(internalPropGet("ElapsedTime")); }
+
+ Q_PROPERTY(QString LastPackage READ lastPackage)
+ inline QString lastPackage() const
+ { return qvariant_cast< QString >(internalPropGet("LastPackage")); }
+
+ Q_PROPERTY(uint Percentage READ percentage)
+ inline uint percentage() const
+ { return qvariant_cast< uint >(internalPropGet("Percentage")); }
+
+ Q_PROPERTY(uint RemainingTime READ remainingTime)
+ inline uint remainingTime() const
+ { return qvariant_cast< uint >(internalPropGet("RemainingTime")); }
+
+ Q_PROPERTY(QString Role READ role)
+ inline QString role() const
+ { return qvariant_cast< QString >(internalPropGet("Role")); }
+
+ Q_PROPERTY(uint Speed READ speed)
+ inline uint speed() const
+ { return qvariant_cast< uint >(internalPropGet("Speed")); }
+
+ Q_PROPERTY(QString Status READ status)
+ inline QString status() const
+ { return qvariant_cast< QString >(internalPropGet("Status")); }
+
+ Q_PROPERTY(uint Subpercentage READ subpercentage)
+ inline uint subpercentage() const
+ { return qvariant_cast< uint >(internalPropGet("Subpercentage")); }
+
+ Q_PROPERTY(uint Uid READ uid)
+ inline uint uid() const
+ { return qvariant_cast< uint >(internalPropGet("Uid")); }
+
public Q_SLOTS: // METHODS
inline QDBusPendingReply<> AcceptEula(const QString &eula_id)
{
@@ -56,12 +100,6 @@
return asyncCallWithArgumentList(QLatin1String("DownloadPackages"), argumentList);
}
- inline QDBusPendingReply<bool> GetAllowCancel()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetAllowCancel"), argumentList);
- }
-
inline QDBusPendingReply<> GetCategories()
{
QList<QVariant> argumentList;
@@ -102,12 +140,6 @@
return asyncCallWithArgumentList(QLatin1String("GetOldTransactions"), argumentList);
}
- inline QDBusPendingReply<QString> GetPackageLast()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetPackageLast"), argumentList);
- }
-
inline QDBusPendingReply<> GetPackages(const QString &filter)
{
QList<QVariant> argumentList;
@@ -115,23 +147,6 @@
return asyncCallWithArgumentList(QLatin1String("GetPackages"), argumentList);
}
- inline QDBusPendingReply GetProgress()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetProgress"), argumentList);
- }
- inline QDBusReply<uint> GetProgress(uint &subpercentage, uint &elapsed, uint &remaining)
- {
- QList<QVariant> argumentList;
- QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetProgress"), argumentList);
- if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 4) {
- subpercentage = qdbus_cast<uint>(reply.arguments().at(1));
- elapsed = qdbus_cast<uint>(reply.arguments().at(2));
- remaining = qdbus_cast<uint>(reply.arguments().at(3));
- }
- return reply;
- }
-
inline QDBusPendingReply<> GetRepoList(const QString &filter)
{
QList<QVariant> argumentList;
@@ -146,27 +161,6 @@
return asyncCallWithArgumentList(QLatin1String("GetRequires"), argumentList);
}
- inline QDBusPendingReply GetRole()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetRole"), argumentList);
- }
- inline QDBusReply<QString> GetRole(QString &text)
- {
- QList<QVariant> argumentList;
- QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetRole"), argumentList);
- if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
- text = qdbus_cast<QString>(reply.arguments().at(1));
- }
- return reply;
- }
-
- inline QDBusPendingReply<QString> GetStatus()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("GetStatus"), argumentList);
- }
-
inline QDBusPendingReply<> GetUpdateDetail(const QStringList &package_ids)
{
QList<QVariant> argumentList;
@@ -202,12 +196,6 @@
return asyncCallWithArgumentList(QLatin1String("InstallSignature"), argumentList);
}
- inline QDBusPendingReply<bool> IsCallerActive()
- {
- QList<QVariant> argumentList;
- return asyncCallWithArgumentList(QLatin1String("IsCallerActive"), argumentList);
- }
-
inline QDBusPendingReply<> RefreshCache(bool force)
{
QList<QVariant> argumentList;
@@ -236,10 +224,10 @@
return asyncCallWithArgumentList(QLatin1String("RepoSetData"), argumentList);
}
- inline QDBusPendingReply<> Resolve(const QString &filter, const QStringList &package)
+ inline QDBusPendingReply<> Resolve(const QString &filter, const QStringList &packages)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(package);
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(packages);
return asyncCallWithArgumentList(QLatin1String("Resolve"), argumentList);
}
@@ -250,39 +238,67 @@
return asyncCallWithArgumentList(QLatin1String("Rollback"), argumentList);
}
- inline QDBusPendingReply<> SearchDetails(const QString &filter, const QString &search)
+ inline QDBusPendingReply<> SearchDetails(const QString &filter, const QStringList &values)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(search);
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(values);
return asyncCallWithArgumentList(QLatin1String("SearchDetails"), argumentList);
}
- inline QDBusPendingReply<> SearchFile(const QString &filter, const QString &search)
+ inline QDBusPendingReply<> SearchFiles(const QString &filter, const QStringList &values)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(values);
+ return asyncCallWithArgumentList(QLatin1String("SearchFiles"), argumentList);
+ }
+
+ inline QDBusPendingReply<> SearchGroups(const QString &filter, const QStringList &values)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(values);
+ return asyncCallWithArgumentList(QLatin1String("SearchGroups"), argumentList);
+ }
+
+ inline QDBusPendingReply<> SearchNames(const QString &filter, const QStringList &values)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(values);
+ return asyncCallWithArgumentList(QLatin1String("SearchNames"), argumentList);
+ }
+
+ inline QDBusPendingReply<> SetHints(const QStringList &hints)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(search);
- return asyncCallWithArgumentList(QLatin1String("SearchFile"), argumentList);
+ argumentList << qVariantFromValue(hints);
+ return asyncCallWithArgumentList(QLatin1String("SetHints"), argumentList);
}
- inline QDBusPendingReply<> SearchGroup(const QString &filter, const QString &search)
+ inline QDBusPendingReply<> SimulateInstallFiles(const QStringList &full_paths)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(search);
- return asyncCallWithArgumentList(QLatin1String("SearchGroup"), argumentList);
+ argumentList << qVariantFromValue(full_paths);
+ return asyncCallWithArgumentList(QLatin1String("SimulateInstallFiles"), argumentList);
}
- inline QDBusPendingReply<> SearchName(const QString &filter, const QString &search)
+ inline QDBusPendingReply<> SimulateInstallPackages(const QStringList &package_ids)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(search);
- return asyncCallWithArgumentList(QLatin1String("SearchName"), argumentList);
+ argumentList << qVariantFromValue(package_ids);
+ return asyncCallWithArgumentList(QLatin1String("SimulateInstallPackages"), argumentList);
+ }
+
+ inline QDBusPendingReply<> SimulateRemovePackages(const QStringList &package_ids, bool autoremove)
+ {
+ QList<QVariant> argumentList;
+ argumentList << qVariantFromValue(package_ids) << qVariantFromValue(autoremove);
+ return asyncCallWithArgumentList(QLatin1String("SimulateRemovePackages"), argumentList);
}
- inline QDBusPendingReply<> SetLocale(const QString &code)
+ inline QDBusPendingReply<> SimulateUpdatePackages(const QStringList &package_ids)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(code);
- return asyncCallWithArgumentList(QLatin1String("SetLocale"), argumentList);
+ argumentList << qVariantFromValue(package_ids);
+ return asyncCallWithArgumentList(QLatin1String("SimulateUpdatePackages"), argumentList);
}
inline QDBusPendingReply<> UpdatePackages(bool only_trusted, const QStringList &package_ids)
@@ -299,17 +315,16 @@
return asyncCallWithArgumentList(QLatin1String("UpdateSystem"), argumentList);
}
- inline QDBusPendingReply<> WhatProvides(const QString &filter, const QString &type, const QString &search)
+ inline QDBusPendingReply<> WhatProvides(const QString &filter, const QString &type, const QStringList &values)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(filter) << qVariantFromValue(type) << qVariantFromValue(search);
+ argumentList << qVariantFromValue(filter) << qVariantFromValue(type) << qVariantFromValue(values);
return asyncCallWithArgumentList(QLatin1String("WhatProvides"), argumentList);
}
Q_SIGNALS: // SIGNALS
- void AllowCancel(bool allow_cancel);
- void CallerActiveChanged(bool is_active);
void Category(const QString &parent_id, const QString &cat_id, const QString &name, const QString &summary, const QString &icon);
+ void Changed();
void Destroy();
void Details(const QString &package_id, const QString &license, const QString &group, const QString &detail, const QString &url, qulonglong size);
void DistroUpgrade(const QString &type, const QString &name, const QString &summary);
@@ -320,11 +335,9 @@
void MediaChangeRequired(const QString &media_type, const QString &media_id, const QString &media_text);
void Message(const QString &type, const QString &details);
void Package(const QString &info, const QString &package_id, const QString &summary);
- void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining);
void RepoDetail(const QString &repo_id, const QString &description, bool enabled);
void RepoSignatureRequired(const QString &package_id, const QString &repository_name, const QString &key_url, const QString &key_userid, const QString &key_id, const QString &key_fingerprint, const QString &key_timestamp, const QString &type);
void RequireRestart(const QString &type, const QString &package_id);
- void StatusChanged(const QString &status);
void Transaction(const QString &old_tid, const QString ×pec, bool succeeded, const QString &role, uint duration, const QString &data, uint uid, const QString &cmdline);
void UpdateDetail(const QString &package_id, const QString &updates, const QString &obsoletes, const QString &vendor_url, const QString &bugzilla_url, const QString &cve_url, const QString &restart, const QString &update_text, const QString &changelog, const QString &state, const QString &issued, const QString &updated);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kupdateapplet-0.9.13/src/packagekit/qpackagekitconnector.cpp new/kupdateapplet-0.9.15/src/packagekit/qpackagekitconnector.cpp
--- old/kupdateapplet-0.9.13/src/packagekit/qpackagekitconnector.cpp 2010-05-12 16:23:34.000000000 +0200
+++ new/kupdateapplet-0.9.15/src/packagekit/qpackagekitconnector.cpp 2010-05-31 10:54:59.000000000 +0200
@@ -51,17 +51,17 @@
SLOT( proxy_Finished(const QString, uint) )
);
- disconnect(transactioninterface,
- SIGNAL( ProgressChanged(uint, uint, uint, uint) ),
- this,
- SLOT( proxy_ProgressChanged(uint,uint, uint, uint) )
- );
-
- disconnect(transactioninterface,
- SIGNAL( StatusChanged(const QString &) ),
- this,
- SLOT( proxy_StatusChanged(const QString &) )
- );
+// disconnect(transactioninterface,
+// SIGNAL( ProgressChanged(uint, uint, uint, uint) ),
+// this,
+// SLOT( proxy_ProgressChanged(uint,uint, uint, uint) )
+// );
+
+// disconnect(transactioninterface,
+// SIGNAL( StatusChanged(const QString &) ),
+// this,
+// SLOT( proxy_StatusChanged(const QString &) )
+// );
disconnect(transactioninterface,
SIGNAL( Transaction(const QString &, const QString &, bool, const QString &, uint, const QString &, uint, const QString &) ),
@@ -195,17 +195,17 @@
SLOT(proxy_Transaction(const QString &, const QString &, bool, const QString &, uint, const QString &, uint, const QString &) )
);
- connect(transactioninterface,
- SIGNAL( ProgressChanged(uint, uint, uint, uint) ),
- this,
- SLOT( proxy_ProgressChanged(uint,uint, uint, uint) )
- );
-
- connect(transactioninterface,
- SIGNAL( StatusChanged(const QString &) ),
- this,
- SLOT( proxy_StatusChanged(const QString &) )
- );
+// connect(transactioninterface,
+// SIGNAL( ProgressChanged(uint, uint, uint, uint) ),
+// this,
+// SLOT( proxy_ProgressChanged(uint,uint, uint, uint) )
+// );
+
+// connect(transactioninterface,
+// SIGNAL( StatusChanged(const QString &) ),
+// this,
+// SLOT( proxy_StatusChanged(const QString &) )
+// );
@@ -415,7 +415,7 @@
if (!transactioninterface)
return false;
- QDBusReply<void> reply = transactioninterface->WhatProvides("none", "driver", "drivers_for_attached_hardware");
+ QDBusReply<void> reply = transactioninterface->WhatProvides("none", "driver", QStringList("drivers_for_attached_hardware"));
if(reply.isValid())
{
@@ -631,7 +631,7 @@
if (!transactioninterface)
return false;
- QDBusReply<void> reply = transactioninterface->SearchFile("none", search);
+ QDBusReply<void> reply = transactioninterface->SearchFiles("none", QStringList(search));
if(reply.isValid())
{
@@ -663,11 +663,44 @@
kDebug() << "Finished [status: " << status << "] [runtime: " << runtime << "]";
QPackageKitTransactionInterface *transactioninterface = qobject_cast(QObject::sender());
-
+
+ if ( transactioninterface )
+ {
+ QString reply = transactioninterface->role();
+
+ if ( reply == "get-updates" ||
+ reply == "what-provides" ||
+ reply == "search-file" )
+ emit GetUpdatesFinished();
+
+ if ( reply == "get-repo-list" )
+ emit RepoListFinished();
+
+ if ( reply == "update-system" ||
+ reply == "install-package" ||
+ reply == "install-packages" ||
+ reply == "install-file" ||
+ reply == "install-files" ||
+ reply == "update-package" ||
+ reply == "update-packages" )
+ emit InstallFinished();
+
+ kDebug() << reply ;
+
+
+ disconnectFromInterface(transactioninterface);
+ emit Finished(Exit::fromString(status), runtime);
+ }
+ else
+ {
+ kDebug() << "Can't figure out which transaction is finishing";
+ }
+
+ /*
if ( transactioninterface )
{
QString param;
- QDBusReply<QString> reply = transactioninterface->GetRole(param);
+ QDBusReply<QString> reply = transactioninterface->role(param);
if(!reply.isValid())
{
kDebug() << "role replay not valid";
@@ -706,6 +739,9 @@
{
kDebug() << "Can't figure out which transaction is finishing";
}
+
+*/
+
}
void QPackageKitConnector::proxy_Transaction(const QString &old_tid, const QString ×pec, bool succeeded, const QString &role, uint duration, const QString &data, uint uid, const QString &cmdline)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org