diff options
| author | Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> | 2009-12-10 12:14:54 +0200 |
|---|---|---|
| committer | Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> | 2009-12-10 12:14:54 +0200 |
| commit | c435fb3c7b523ce8abbb6b87d802dbd7c12b6a1c (patch) | |
| tree | 3e685c9bf185aa8b49d5082837b5ea44f2794de3 | |
| parent | b8971ba7f8b8d4287060ebb91889f892396a10a0 (diff) | |
| parent | 3658cc66feee403cb5fca47e21574c5a70578a97 (diff) | |
Merge branch 'master' into needed-for-commander
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | libcontextsubscriber/cls/context-ls.cpp | 11 | ||||
| -rwxr-xr-x | libcontextsubscriber/customer-tests/registry/registry.py | 8 |
4 files changed, 21 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index bca916bf..8d4814ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([ContextKit], [0.5.3~unreleased], [marius.vollmer@nokia.com], ContextKit) +AC_INIT([ContextKit], [0.5.4~unreleased], [marius.vollmer@nokia.com], ContextKit) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 tar-ustar 1.9]) diff --git a/debian/changelog b/debian/changelog index 4e5b8bc1..6797d3f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ -contextkit (0.5.3~unreleased) unstable; urgency=low +contextkit (0.5.4~unreleased) unstable; urgency=low + + * + + -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> Wed, 09 Dec 2009 11:49:06 +0200 + +contextkit (0.5.3) unstable; urgency=low * deprecated the old D-Bus protocol on the subscriber side, now it is only tried for talking to the commander, not for regular providers. Implemented: Swp#CntFr-386 - -- Gergely Risko <gergely+context@risko.hu> Fri, 27 Nov 2009 12:04:30 +0200 + -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> Wed, 09 Dec 2009 11:45:29 +0200 contextkit (0.5.2) unstable; urgency=low diff --git a/libcontextsubscriber/cls/context-ls.cpp b/libcontextsubscriber/cls/context-ls.cpp index 58026b99..69ad5776 100644 --- a/libcontextsubscriber/cls/context-ls.cpp +++ b/libcontextsubscriber/cls/context-ls.cpp @@ -45,7 +45,8 @@ int main(int argc, char **argv) ContextRegistryInfo *regInfo = ContextRegistryInfo::instance(backendName); QStringList keys = regInfo->listKeys(); - + keys.sort(); + QRegExp rx(filter, Qt::CaseSensitive, QRegExp::Wildcard); QTextStream out(stdout); foreach (QString key, keys) { @@ -55,9 +56,13 @@ int main(int argc, char **argv) if (provided && !info.provided()) continue; if (longListing) { + // Print the key and the type even if we don't have providers + if (info.providers().size() == 0) + out << key << "\t" << info.typeInfo().name() << endl; + for (int i = 0; i < info.providers().size(); i++ ) - out << key << "\t" << info.type() << "\t" << info.providers()[i].plugin << "\t" - << info.providers()[i].constructionString << "\n"; + out << key << "\t" << info.typeInfo().name() << "\t" << info.providers()[i].plugin << "\t" + << info.providers()[i].constructionString << endl; } else out << key << "\n"; if (doc) { diff --git a/libcontextsubscriber/customer-tests/registry/registry.py b/libcontextsubscriber/customer-tests/registry/registry.py index 0511a7ce..32a193c1 100755 --- a/libcontextsubscriber/customer-tests/registry/registry.py +++ b/libcontextsubscriber/customer-tests/registry/registry.py @@ -60,10 +60,10 @@ class PrintingProperties(unittest.TestCase): "context-provide.context couldn't been written by context-provide") info_client = CLTool("context-ls","-l","-d","test.*") - self.assert_(info_client.expect(["^test.int\tINT\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.double\tDOUBLE\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.truth\tTRUTH\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.string\tSTRING\tcontextkit-dbus\tsession:com.nokia.test$", + self.assert_(info_client.expect(["^test.int\tinteger\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.double\tnumber\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.truth\tbool\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.string\tstring\tcontextkit-dbus\tsession:com.nokia.test$", "^Documentation: A phony but very flexible property.$"]), "Bad introspection result from context-ls") |