[PackageKit-commit] packagekit: Branch 'master' - 4 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Sat Dec 6 02:29:37 PST 2008
contrib/command-not-found/CommandNotFound.conf | 2 +-
lib/packagekit-qt/src/client.cpp | 5 +++++
lib/packagekit-qt/src/client.h | 5 +++++
lib/packagekit-qt/src/daemonproxy.h | 12 +++++++++---
lib/packagekit-qt/src/transaction.cpp | 2 +-
lib/packagekit-qt/src/transactionproxy.h | 8 ++++----
6 files changed, 25 insertions(+), 9 deletions(-)
New commits:
commit c906e82b748d595912565899c5ea25b0b363d098
Merge: cfdfff5... e193f25...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Dec 6 10:24:00 2008 +0000
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit e193f25a988d41ebba1764c5f719a72048facc9b
Author: Adrien BUSTANY <madcat at mymadcat.com>
Date: Fri Dec 5 20:46:53 2008 +0100
PackageKit-qt : Fix the old transactions, and upgrade to new API (uid & cmdline)
diff --git a/lib/packagekit-qt/src/transaction.cpp b/lib/packagekit-qt/src/transaction.cpp
index aee7560..5f527b0 100644
--- a/lib/packagekit-qt/src/transaction.cpp
+++ b/lib/packagekit-qt/src/transaction.cpp
@@ -54,9 +54,9 @@ Transaction::Transaction(const QString& tid, Client* parent) : QObject(parent)
connect(d->p, SIGNAL(EulaRequired(const QString&, const QString&, const QString&, const QString&)), d, SLOT(eulaRequired(const QString&, const QString&, const QString&, const QString&)));
connect(d->p, SIGNAL(RequireRestart(const QString&, const QString&)), d, SLOT(requireRestart(const QString&, const QString&)));
connect(d->p, SIGNAL(StatusChanged(const QString&)), d, SLOT(statusChanged(const QString&)));
+ connect(d->p, SIGNAL(Transaction(const QString&, const QString&, bool, const QString&, uint, const QString&, uint, const QString&)), d, SLOT(transaction(const QString&, const QString&, bool, const QString&, uint, const QString&, uint, const QString&)));
connect(d->p, SIGNAL(UpdateDetail(const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&)), d, SLOT(updateDetail(const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&, const QString&)));
- qDebug() << "New transaction with tid" << tid;
}
Transaction::Transaction(const QString& tid, const QString& timespec, bool succeeded, const QString& role, uint duration, const QString& data, uint uid, const QString& cmdline, Client* parent) : QObject(parent)
diff --git a/lib/packagekit-qt/src/transactionproxy.h b/lib/packagekit-qt/src/transactionproxy.h
index 30e36a5..0444a0d 100644
--- a/lib/packagekit-qt/src/transactionproxy.h
+++ b/lib/packagekit-qt/src/transactionproxy.h
@@ -1,6 +1,6 @@
/*
* This file was generated by dbusxml2cpp version 0.6
- * Command line was: dbusxml2cpp -c TransactionProxy -p transactionproxy.h /home/madcat/code/packagekit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
+ * Command line was: dbusxml2cpp -c TransactionProxy -p transactionproxy.h /home/madcat/code/PackageKit/src/org.freedesktop.PackageKit.Transaction.xml org.freedesktop.PackageKit.Transaction
*
* dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
*
@@ -8,8 +8,8 @@
* Do not edit! All changes made to it will be lost.
*/
-#ifndef TRANSACTIONPROXY_H_1221424433
-#define TRANSACTIONPROXY_H_1221424433
+#ifndef TRANSACTIONPROXY_H_1228504363
+#define TRANSACTIONPROXY_H_1228504363
#include <QtCore/QObject>
#include <QtCore/QByteArray>
@@ -315,7 +315,7 @@ Q_SIGNALS: // SIGNALS
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 &details);
void StatusChanged(const QString &status);
- void Transaction(const QString &old_tid, const QString ×pec, bool succeeded, const QString &role, uint duration, const QString &data);
+ 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);
};
commit 0234de4199bf77104860c9b1e64a9b209e57255b
Author: Adrien BUSTANY <madcat at mymadcat.com>
Date: Fri Dec 5 20:11:11 2008 +0100
Add GetMimeTypes to Qt bindings
diff --git a/lib/packagekit-qt/src/client.cpp b/lib/packagekit-qt/src/client.cpp
index 1d22e24..7502b2e 100644
--- a/lib/packagekit-qt/src/client.cpp
+++ b/lib/packagekit-qt/src/client.cpp
@@ -112,6 +112,11 @@ Client::Groups Client::getGroups()
return flags;
}
+QStringList Client::getMimeTypes()
+{
+ return d->daemon->GetMimeTypes().value().split(";");
+}
+
Client::NetworkState Client::getNetworkState()
{
QString state = d->daemon->GetNetworkState();
diff --git a/lib/packagekit-qt/src/client.h b/lib/packagekit-qt/src/client.h
index 7031011..3bed227 100644
--- a/lib/packagekit-qt/src/client.h
+++ b/lib/packagekit-qt/src/client.h
@@ -218,6 +218,11 @@ public:
Groups getGroups();
/**
+ * Returns a list containing the MIME types supported by the current backend
+ */
+ QStringList getMimeTypes();
+
+ /**
* Describes the current network state
*/
typedef enum {
diff --git a/lib/packagekit-qt/src/daemonproxy.h b/lib/packagekit-qt/src/daemonproxy.h
index 8a46f50..9e85490 100644
--- a/lib/packagekit-qt/src/daemonproxy.h
+++ b/lib/packagekit-qt/src/daemonproxy.h
@@ -2,14 +2,14 @@
* This file was generated by dbusxml2cpp version 0.6
* Command line was: dbusxml2cpp -c DaemonProxy -p daemonproxy.h /home/madcat/code/packagekit/src/org.freedesktop.PackageKit.xml org.freedesktop.PackageKit
*
- * dbusxml2cpp is Copyright (C) 2006 Trolltech ASA. All rights reserved.
+ * dbusxml2cpp is Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
*
* This is an auto-generated file.
* Do not edit! All changes made to it will be lost.
*/
-#ifndef DAEMONPROXY_H_1221406375
-#define DAEMONPROXY_H_1221406375
+#ifndef DAEMONPROXY_H_1228501948
+#define DAEMONPROXY_H_1228501948
#include <QtCore/QObject>
#include <QtCore/QByteArray>
@@ -66,6 +66,12 @@ public Q_SLOTS: // METHODS
return callWithArgumentList(QDBus::Block, QLatin1String("GetGroups"), argumentList);
}
+ inline QDBusReply<QString> GetMimeTypes()
+ {
+ QList<QVariant> argumentList;
+ return callWithArgumentList(QDBus::Block, QLatin1String("GetMimeTypes"), argumentList);
+ }
+
inline QDBusReply<QString> GetNetworkState()
{
QList<QVariant> argumentList;
commit cfdfff5d52fcdfff5a302759d50dcc59750d416b
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Dec 5 18:31:25 2008 +0000
trivial: fix copy paste typo
diff --git a/contrib/command-not-found/CommandNotFound.conf b/contrib/command-not-found/CommandNotFound.conf
index 46def12..9f32dbe 100644
--- a/contrib/command-not-found/CommandNotFound.conf
+++ b/contrib/command-not-found/CommandNotFound.conf
@@ -22,7 +22,7 @@ MultipleMatch=warn
# software sources. This may introduce a non-trivial delay if the sources
# have not been recently refreshed.
#
-# Allowed values are 'ignore', 'install', 'ask' or 'warn'
+# Allowed values are 'true' or 'false'
#
# default=true
SoftwareSourceSearch=true
More information about the PackageKit-commit
mailing list