Merge lp:~mterry/telephony-service/greeter-contacts into lp:telephony-service

[Michael Terry]

Share current call contact info with the greeter.

Share current call contact info with the greeter.

When we split the unity8 greeter out into a separate process, it will no longer be able to see the user's contact database. So it will need to query the active session for the information.

Here's how this branch does that:
* Adds a custom DBus property to AccountsService that can only be read by the greeter and set by the user.
* When a call comes in and telephony-service notifies the user, it also sets the AccountsService property.
* The greeter sees the call, notifies the user and watches the currently selected user's AccountsService property for updates. If contact information is set for the current incoming phone number, it will update the notification.
* One interesting issue is that the contact photo can't be read by the greeter because ~/.local/share/evolution is not openable by the lightdm user. So when we are updating AccountsService, we also copy the relevant contact photo to ~/.telephony-service-contact-image. There are two problems with this: (1) it is readable by the world (though to be fair, the world can see it on the screen when a call is happening) and (2) if the user's directory is encrypted, it won't be accessible. The proper fix for both of these is for LightDM to provide a /run/user-style space for persistent data sharing between sessions and the greeter. But that's a separate bug, and I'm looking into it. For now, the photo in the home dir is good enough, since Touch doesn't support encrypted home dirs yet.

I added tests and manually tested on the device (which is kinda tricky, since you need several other branches to get the split greeter to be in effect -- if interested, can provide info).

This branch shouldn't hurt anything to land now, before the split greeter happens. It will just be updating the DBus field without anyone to read it. No big deal.

** Checklist **

Are there any related MPs required for this MP to build/function as expected? Please list.
- No (note that this branch is not really helpful before the split greeter lands; but it does its job fine without other branches)
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
- Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
- Yes, with split branches installed
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
- Yeah
If you changed the UI, was the change specified/approved by design?
- N/A
If you changed the packaging (debian), did you subscribe a core-dev to this MP?
- I am core-dev

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:763
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/83/rebuild

review: Approve (continuous-integration)

[Michael Terry (mterry)]

As discussed, this strategy is back to being useful, since we'll run a telephony stack in the greeter. Please review!

[Gustavo Pichorim Boiko (boiko)]

Code looks good and after testing no regressions were found.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/telephony-service-autolanding/42/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-autolanding/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-autolanding/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-autolanding/8/console

review: Needs Fixing (continuous-integration)

[lp:~mterry/telephony-service/greeter-contacts]

764. By Michael Terry on 2014-01-29

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:764
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/103/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Review comments:
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
YES

Did CI run pass? If not, please explain why.
YES

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
YES

=== added file 'approver/50-com.canonical.TelephonyServiceApprover.pkla'
--- approver/50-com.canonical.TelephonyServiceApprover.pkla	1970-01-01 00:00:00 +0000
+++ approver/50-com.canonical.TelephonyServiceApprover.pkla	2014-01-29 15:16:53 +0000
@@ -0,0 +1,6 @@
+[Allow LightDM to read TelephonyServiceApprover fields]
+Identity=unix-user:lightdm
+Action=com.canonical.TelephonyServiceApprover.ReadAny
+ResultAny=no
+ResultInactive=yes
+ResultActive=yes

=== modified file 'approver/CMakeLists.txt'
--- approver/CMakeLists.txt	2013-08-22 22:41:13 +0000
+++ approver/CMakeLists.txt	2014-01-29 15:16:53 +0000
@@ -2,6 +2,7 @@
 set(qt_SRCS
     approver.cpp
     approverdbus.cpp
+    greetercontacts.cpp
     )
 
 set(approver_SRCS main.cpp ${qt_SRCS})
@@ -18,6 +19,7 @@
 link_directories(${MESSAGING_MENU_LIBRARY_DIRS})
 
 add_executable(telephony-service-approver ${approver_SRCS} ${approver_HDRS})
+set_target_properties(telephony-service-approver PROPERTIES COMPILE_DEFINITIONS AS_BUSNAME=systemBus)
 qt5_use_modules(telephony-service-approver Contacts Core DBus Gui Multimedia Qml)
 
 target_link_libraries(telephony-service-approver
@@ -31,3 +33,14 @@
 install(TARGETS telephony-service-approver RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.TelephonyServiceApprover.service DESTINATION share/dbus-1/services)
 install(FILES TelephonyServiceApprover.client DESTINATION share/telepathy/clients)
+install(FILES 50-com.canonical.TelephonyServiceApprover.pkla DESTINATION "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1/localauthority/10-vendor.d")
+install(FILES com.canonical.TelephonyServiceApprover.policy DESTINATION share/polkit-1/actions)
+install(FILES com.canonical.TelephonyServiceApprover.xml DESTINATION share/dbus-1/interfaces)
+
+# Create accountsservice symlink for above dbus interface
+install(CODE "
+execute_process(COMMAND mkdir -p \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces\")
+execute_process(COMMAND ln -sf ../../dbus-1/interfaces/com.canonical.TelephonyServiceApprover.xml \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/share/accountsservice/interfaces\")
+    ")
+
+add_subdirectory(tests)

=== modified file 'approver/approver.cpp'
--- approver/approver.cpp	2013-12-03 15:20:30 +0000
+++ approver/approver.cpp	2014-01-29 15:16:53 +0000
@@ -25,6 +25,7 @@
 #include "chatmanager.h"
 #include "config.h"
 #include "contactutils.h"
+#include "greetercontacts.h"
 #include "ringtone.h"
 
 #include <QContactAvatar>
@@ -48,8 +49,12 @@
 
 Approver::Approver()
 : Tp::AbstractClientApprover(channelFilters()),
-  mPendingSnapDecision(NULL)
+  mPendingSnapDecision(NULL),
+  mGreeterContacts(NULL)
 {
+    mDefaultTitle = C::gettext("Unknown caller");
+    mDefaultIcon = QUrl(telephonyServiceDir() + "assets/[e-mail]").toEncoded();
+
     ApproverDBus *dbus = new ApproverDBus();
     connect(dbus,
             SIGNAL(acceptCallRequested()),
@@ -58,6 +63,12 @@
             SIGNAL(rejectCallRequested()),
             SLOT(onRejectCallRequested()));
     dbus->connectToBus();
+
+    if (qgetenv("XDG_SESSION_CLASS") == "greeter") {
+        mGreeterContacts = new GreeterContacts(this);
+        connect(mGreeterContacts, SIGNAL(contactUpdated(QtContacts::QContact)),
+                this, SLOT(updateNotification(QtContacts::QContact)));
+    }
 }
 
 Approver::~Approver()
@@ -167,6 +178,34 @@
     delete (EventData*) data;
 }
 
+void Approver::updateNotification(const QContact &contact)
+{
+    if (!mPendingSnapDecision)
+        return;
+
+    QString displayLabel = ContactUtils::formatContactName(contact);
+    QString avatar = contact.detail<QContactAvatar>().imageUrl().toEncoded();
+
+    if (displayLabel.isEmpty()) {
+        displayLabel = mDefaultTitle;
+    }
+
+    if (avatar.isEmpty()) {
+        avatar = mDefaultIcon;
+    }
+
+    notify_notification_update(mPendingSnapDecision,
+                               displayLabel.toStdString().c_str(),
+                               mCachedBody.toStdString().c_str(),
+                               avatar.toStdString().c_str());
+
+    GError *error = NULL;
+    if (!notify_notification_show(mPendingSnapDecision, &error)) {
+        qWarning() << "Failed to show snap decision:" << error->message;
+        g_error_free (error);
+    }
+}
+
 void Approver::onChannelReady(Tp::PendingOperation *op)
 {
     Tp::PendingReady *pr = qobject_cast<Tp::PendingReady*>(op);
@@ -210,25 +249,21 @@
     data->dispatchOp = dispatchOp;
     data->channel = channel;
 
-    QString title = C::gettext("Unknown caller");
-    QString icon = QUrl(telephonyServiceDir() + "assets/[e-mail]").toEncoded();
-    QString body;
-
     if (!contact->id().isEmpty()) {
         if (contact->id().startsWith("x-ofono-private")) {
-            body = QString::fromUtf8(C::gettext("Calling from private number"));
+            mCachedBody = QString::fromUtf8(C::gettext("Calling from private number"));
         } else if (contact->id().startsWith("x-ofono-unknown")) {
-            body = QString::fromUtf8(C::gettext("Calling from unknown number"));
+            mCachedBody = QString::fromUtf8(C::gettext("Calling from unknown number"));
         } else {
-            body = QString::fromUtf8(C::gettext("Calling from %1")).arg(contact->id());
+            mCachedBody = QString::fromUtf8(C::gettext("Calling from %1")).arg(contact->id());
         }
     } else {
-        body = C::gettext("Caller number is not available");
+        mCachedBody = C::gettext("Caller number is not available");
     }
 
-    notification = notify_notification_new (title.toStdString().c_str(),
-                                            body.toStdString().c_str(),
-                                            icon.toStdString().c_str());
+    notification = notify_notification_new (mDefaultTitle.toStdString().c_str(),
+                                            mCachedBody.toStdString().c_str(),
+                                            mDefaultIcon.toStdString().c_str());
     notify_notification_set_hint_string(notification,
                                         "x-canonical-snap-decisions",
                                         "true");
@@ -251,41 +286,29 @@
 
     mPendingSnapDecision = notification;
 
-    // try to match the contact info
-    QContactFetchRequest *request = new QContactFetchRequest(this);
-    request->setFilter(QContactPhoneNumber::match(contact->id()));
-
-    // lambda function to update the notification
-    QObject::connect(request, &QContactAbstractRequest::resultsAvailable, [request, notification, title, body, icon]() {
-        if (request && request->contacts().size() > 0) {
-            // use the first match
-            QContact contact = request->contacts().at(0);
-            QString displayLabel = ContactUtils::formatContactName(contact);
-            QString avatar = contact.detail<QContactAvatar>().imageUrl().toEncoded();
-
-            if (displayLabel.isEmpty()) {
-                displayLabel = title;
-            }
-
-            if (avatar.isEmpty()) {
-                avatar = icon;
-            }
-
-            notify_notification_update(notification,
-                                       displayLabel.toStdString().c_str(),
-                                       body.toStdString().c_str(),
-                                       avatar.toStdString().c_str());
-
-            GError *error = NULL;
-            if (!notify_notification_show(notification, &error)) {
-                qWarning() << "Failed to show snap decision:" << error->message;
-                g_error_free (error);
-            }
-        }
-    });
-
-    request->setManager(ContactUtils::sharedManager());
-    request->start();
+    if (mGreeterContacts) { // we're in the greeter's session
+        mGreeterContacts->setFilter(QContactPhoneNumber::match(contact->id()));
+    } else {
+        // try to match the contact info
+        QContactFetchRequest *request = new QContactFetchRequest(this);
+        request->setFilter(QContactPhoneNumber::match(contact->id()));
+
+        // lambda function to update the notification
+        QObject::connect(request, &QContactAbstractRequest::resultsAvailable, [this, request]() {
+            if (request && request->contacts().size() > 0) {
+                // use the first match
+                QContact contact = request->contacts().at(0);
+
+                updateNotification(contact);
+
+                // Also notify greeter via AccountsService
+                GreeterContacts::emitContact(contact);
+            }
+        });
+
+        request->setManager(ContactUtils::sharedManager());
+        request->start();
+    }
 
     GError *error = NULL;
     if (!notify_notification_show(notification, &error)) {

=== modified file 'approver/approver.h'
--- approver/approver.h	2013-10-04 21:15:46 +0000
+++ approver/approver.h	2014-01-29 15:16:53 +0000
@@ -26,11 +26,14 @@
 #include <unistd.h>
 #include <libnotify/notify.h>
 
+#include <QContact>
 #include <QMap>
 #include <TelepathyQt/AbstractClientApprover>
 #include <TelepathyQt/PendingReady>
 #include <TelepathyQt/ChannelDispatchOperation>
 
+class GreeterContacts;
+
 class Approver : public QObject, public Tp::AbstractClientApprover
 {
     Q_OBJECT
@@ -59,11 +62,16 @@
     void closeSnapDecision();
     void onAcceptCallRequested();
     void onRejectCallRequested();
+    void updateNotification(const QtContacts::QContact &contact);
 
 private:
     QList<Tp::ChannelDispatchOperationPtr> mDispatchOps;
     QMap<Tp::PendingOperation*,Tp::ChannelPtr> mChannels;
     NotifyNotification* mPendingSnapDecision;
+    GreeterContacts *mGreeterContacts;
+    QString mDefaultTitle;
+    QString mDefaultIcon;
+    QString mCachedBody;
 };
 
 #endif // APPROVER_H

=== added file 'approver/com.canonical.TelephonyServiceApprover.policy'
--- approver/com.canonical.TelephonyServiceApprover.policy	1970-01-01 00:00:00 +0000
+++ approver/com.canonical.TelephonyServiceApprover.policy	2014-01-29 15:16:53 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<policyconfig>
+        <action id="com.canonical.TelephonyServiceApprover.ChangeOwn">
+                <defaults>
+                        <allow_any>no</allow_any>
+                        <allow_inactive>yes</allow_inactive>
+                        <allow_active>yes</allow_active>
+                </defaults>
+        </action>
+
+        <action id="com.canonical.TelephonyServiceApprover.ReadAny">
+                <defaults>
+                        <allow_any>no</allow_any>
+                        <allow_inactive>no</allow_inactive>
+                        <allow_active>no</allow_active>
+                </defaults>
+        </action>
+</policyconfig>

=== added file 'approver/com.canonical.TelephonyServiceApprover.xml'
--- approver/com.canonical.TelephonyServiceApprover.xml	1970-01-01 00:00:00 +0000
+++ approver/com.canonical.TelephonyServiceApprover.xml	2014-01-29 15:16:53 +0000
@@ -0,0 +1,17 @@
+<node>
+  <interface name="com.canonical.TelephonyServiceApprover">
+
+    <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ChangeOwn"
+                value="com.canonical.TelephonyServiceApprover.ChangeOwn"/>
+
+    <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
+                value="com.canonical.TelephonyServiceApprover.ReadAny"/>
+
+    <property name="CurrentContact" type="a{sv}" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="{}"/>
+    </property>
+
+  </interface>
+</node>

=== added file 'approver/greetercontacts.cpp'
--- approver/greetercontacts.cpp	1970-01-01 00:00:00 +0000
+++ approver/greetercontacts.cpp	2014-01-29 15:16:53 +0000
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Terry <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "greetercontacts.h"
+
+#include <pwd.h>
+#include <QContactAvatar>
+#include <QContactInvalidFilter>
+#include <QContactManagerEngine>
+#include <QContactName>
+#include <QContactPhoneNumber>
+#include <QDBusInterface>
+#include <QDBusPendingCall>
+#include <QDBusPendingReply>
+#include <QDir>
+#include <QFile>
+#include <unistd.h>
+
+QTCONTACTS_USE_NAMESPACE
+
+GreeterContacts::GreeterContacts(QObject *parent)
+: QObject(parent),
+  mFilter(QContactInvalidFilter()),
+  mActiveUser(),
+  mContacts()
+{
+    // Watch for changes
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.connect("com.canonical.UnityGreeter",
+                       "/list",
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       this,
+                       SLOT(greeterPropertiesChanged(QString, QVariantMap, QStringList)));
+
+    connection = QDBusConnection::AS_BUSNAME();
+    connection.connect("org.freedesktop.Accounts",
+                       nullptr,
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       this,
+                       SLOT(accountsPropertiesChanged(QString, QVariantMap, QStringList, QDBusMessage)));
+
+    // Start initial queries
+
+    queryEntry();
+
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         "/org/freedesktop/Accounts",
+                         "org.freedesktop.Accounts",
+                         QDBusConnection::AS_BUSNAME());
+    QDBusPendingCall call = iface.asyncCall("ListCachedUsers");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)),
+            this, SLOT(accountsGetUsersReply(QDBusPendingCallWatcher *)));
+}
+
+GreeterContacts::~GreeterContacts()
+{
+}
+
+void GreeterContacts::setFilter(const QContactFilter &filter)
+{
+    mFilter = filter;
+    signalIfNeeded();
+}
+
+void GreeterContacts::greeterPropertiesChanged(const QString &interface,
+                                               const QVariantMap &changed,
+                                               const QStringList &invalidated)
+{
+    if (interface == "com.canonical.UnityGreeter.List") {
+        if (changed.contains("ActiveEntry")) {
+            updateActiveUser(changed.value("ActiveEntry").toString());
+        } else if (invalidated.contains("ActiveEntry")) {
+            queryEntry();
+        }
+    }
+}
+
+void GreeterContacts::accountsPropertiesChanged(const QString &interface,
+                                                const QVariantMap &changed,
+                                                const QStringList &invalidated,
+                                                const QDBusMessage &message)
+{
+    if (interface == "com.canonical.TelephonyServiceApprover") {
+        if (changed.contains("CurrentContact")) {
+            mContacts.insert(message.path(), qdbus_cast<QVariantMap>(changed.value("CurrentContact")));
+            signalIfNeeded();
+        } else if (invalidated.contains("CurrentContact")) {
+            queryContact(message.path());
+        }
+    }
+}
+
+void GreeterContacts::greeterGetEntryReply(QDBusPendingCallWatcher *watcher)
+{
+    QDBusPendingReply<QVariant> reply = *watcher;
+    if (!reply.isError()) {
+        updateActiveUser(reply.argumentAt<0>().toString());
+    } else {
+        qWarning() << "Failed to get active entry from Unity Greeter:" << reply.error().message();
+    }
+    watcher->deleteLater();
+}
+
+void GreeterContacts::accountsGetUsersReply(QDBusPendingCallWatcher *watcher)
+{
+    QDBusPendingReply<QList<QDBusObjectPath>> reply = *watcher;
+    if (!reply.isError()) {
+        Q_FOREACH (const QDBusObjectPath &user, reply.argumentAt<0>()) {
+            queryContact(user.path());
+        }
+    } else {
+        qWarning() << "Failed to get user list from AccountsService:" << reply.error().message();
+    }
+    watcher->deleteLater();
+}
+
+void GreeterContacts::accountsGetContactReply(QDBusPendingCallWatcher *watcher)
+{
+    QDBusPendingReply<QVariant> reply = *watcher;
+    if (!reply.isError()) {
+        mContacts.insert(watcher->property("telepathyPath").toString(), qdbus_cast<QVariantMap>(reply.argumentAt<0>()));
+        signalIfNeeded();
+    } else {
+        qWarning() << "Failed to get user's contact from AccountsService:" << reply.error().message();
+    }
+    watcher->deleteLater();
+}
+
+void GreeterContacts::queryEntry()
+{
+    QDBusInterface iface("com.canonical.UnityGreeter",
+                         "/list",
+                         "org.freedesktop.DBus.Properties",
+                         QDBusConnection::sessionBus());
+    QDBusPendingCall call = iface.asyncCall("Get", "com.canonical.UnityGreeter.List", "ActiveEntry");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)),
+            this, SLOT(greeterGetEntryReply(QDBusPendingCallWatcher *)));
+}
+
+void GreeterContacts::queryContact(const QString &user)
+{
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         user,
+                         "org.freedesktop.DBus.Properties",
+                         QDBusConnection::AS_BUSNAME());
+    QDBusPendingCall call = iface.asyncCall("Get", "com.canonical.TelephonyServiceApprover", "CurrentContact");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+    watcher->setProperty("telepathyPath", QVariant(user));
+    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)),
+            this, SLOT(accountsGetContactReply(QDBusPendingCallWatcher *)));
+}
+
+void GreeterContacts::updateActiveUser(const QString &username)
+{
+    struct passwd *pwinfo = getpwnam(username.toLatin1());
+    if (pwinfo) {
+        mActiveUser = "/org/freedesktop/Accounts/User" + QString::number(pwinfo->pw_uid);
+        signalIfNeeded();
+    }
+}
+
+QContact GreeterContacts::lookupContact()
+{
+    // For now, only ever look at active user's contact info.  In future,
+    // maybe we should search all users for any matching info.
+    QVariantMap contactInfo = mContacts.value(mActiveUser);
+    if (!contactInfo.empty()) {
+        QContact contact = mapToContact(contactInfo);
+        if (QContactManagerEngine::testFilter(mFilter, contact)) {
+            return contact;
+        }
+    }
+
+    return QContact();
+}
+
+void GreeterContacts::signalIfNeeded()
+{
+    QContact contact = lookupContact();
+    if (!contact.isEmpty()) {
+        Q_EMIT contactUpdated(contact);
+    }
+}
+
+void GreeterContacts::emitContact(const QContact &contact)
+{
+    QString uid = QString::number(getuid());
+    QVariantMap map = contactToMap(contact);
+
+    if (!map.value("Image").toString().isEmpty()) {
+        // OK, so we want to tell LightDM about our contact.  But LightDM won't
+        // have access to our image file in their normal location managed by
+        // evolution.  And rather than give world-readable permissions to our
+        // evolution dir, we minimize the damage by copying the image to a new
+        // more accessible location.
+        // TODO: This is not ideal because this new location is still
+        // world-readable and thus leaks a contact picture and because if the
+        // user's home directory is encrypted, LightDM can't read it.
+        // Hopefully LightDM will soon allow a /run/user style location for
+        // users to share data with it.
+        QFile imageFile(QDir::home().filePath(".telephony-service-contact-image"));
+        imageFile.remove();
+        if (QFile(map.value("Image").toString()).copy(imageFile.fileName())) {
+            map.insert("Image", imageFile.fileName());
+        }
+    }
+
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         "/org/freedesktop/Accounts/User" + uid,
+                         "org.freedesktop.DBus.Properties",
+                         QDBusConnection::AS_BUSNAME());
+    iface.asyncCall("Set", "com.canonical.TelephonyServiceApprover", "CurrentContact", QVariant::fromValue(QDBusVariant(QVariant(map))));
+}
+
+QVariantMap GreeterContacts::contactToMap(const QContact &contact)
+{
+    QVariantMap map;
+
+    QContactAvatar avatarDetail = contact.detail<QContactAvatar>();
+    map.insert("Image", avatarDetail.imageUrl().toLocalFile());
+
+    QContactName nameDetail = contact.detail<QContactName>();
+    map.insert("FirstName", nameDetail.firstName());
+    map.insert("LastName", nameDetail.lastName());
+
+    QContactPhoneNumber numberDetail = contact.detail<QContactPhoneNumber>();
+    map.insert("PhoneNumber", numberDetail.number());
+
+    return map;
+}
+
+QContact GreeterContacts::mapToContact(const QVariantMap &map)
+{
+    QContact contact;
+
+    QContactAvatar avatarDetail;
+    avatarDetail.setValue(QContactAvatar::FieldImageUrl, QUrl::fromLocalFile(map.value("Image").toString()));
+    contact.saveDetail(&avatarDetail);
+
+    // We only use FirstName and LastName right now in ContactUtils::formatContactName().
+    // If/When we use more, we should save more detail values here.
+    QContactName nameDetail;
+    nameDetail.setValue(QContactName::FieldFirstName, map.value("FirstName"));
+    nameDetail.setValue(QContactName::FieldLastName, map.value("LastName"));
+    contact.saveDetail(&nameDetail);
+
+    QContactPhoneNumber numberDetail;
+    numberDetail.setValue(QContactPhoneNumber::FieldNumber, map.value("PhoneNumber"));
+    contact.saveDetail(&numberDetail);
+
+    return contact;
+}

=== added file 'approver/greetercontacts.h'
--- approver/greetercontacts.h	1970-01-01 00:00:00 +0000
+++ approver/greetercontacts.h	2014-01-29 15:16:53 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * Authors:
+ *  Michael Terry <[e-mail]>
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GREETERCONTACTS_H
+#define GREETERCONTACTS_H
+
+#include <QContact>
+#include <QContactFilter>
+#include <QDBusMessage>
+#include <QObject>
+
+class QDBusPendingCallWatcher;
+
+/**
+ * When running under the greeter, we don't have our own contacts database.
+ * Instead, we query AccountsService for the information.
+ */
+class GreeterContacts : public QObject
+{
+    Q_OBJECT
+
+public:
+    GreeterContacts(QObject *parent = 0);
+    ~GreeterContacts();
+
+    void setFilter(const QtContacts::QContactFilter &filter);
+
+    // Records contact info for currently-logged-in user
+    static void emitContact(const QtContacts::QContact &contact);
+
+    // These are really implementation details, but are public for ease of unit testing
+    static QVariantMap contactToMap(const QtContacts::QContact &contact);
+    static QtContacts::QContact mapToContact(const QVariantMap &map);
+
+Q_SIGNALS:
+    void contactUpdated(const QtContacts::QContact &contact);
+
+private Q_SLOTS:
+    void greeterPropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated);
+    void accountsPropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated, const QDBusMessage &message);
+
+    void greeterGetEntryReply(QDBusPendingCallWatcher *watcher);
+    void accountsGetUsersReply(QDBusPendingCallWatcher *watcher);
+    void accountsGetContactReply(QDBusPendingCallWatcher *watcher);
+
+private:
+    void queryEntry();
+    void queryContact(const QString &user);
+    void updateActiveUser(const QString &username);
+    QtContacts::QContact lookupContact();
+    void signalIfNeeded();
+
+    QtContacts::QContactFilter mFilter;
+    QString mActiveUser;
+    QMap<QString, QVariantMap> mContacts;
+};
+
+#endif // GREETERCONTACTS_H

=== added directory 'approver/tests'
=== added file 'approver/tests/CMakeLists.txt'
--- approver/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ approver/tests/CMakeLists.txt	2014-01-29 15:16:53 +0000
@@ -0,0 +1,28 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    )
+
+add_library(GreeterContactsLibSystem MODULE libsystem.c)
+set_target_properties(GreeterContactsLibSystem PROPERTIES OUTPUT_NAME system)
+
+add_executable(GreeterContactsTestServerExe GreeterContactsTestServer.cpp)
+qt5_use_modules(GreeterContactsTestServerExe Core DBus)
+
+add_executable(GreeterContactsTestExe GreeterContactsTest.cpp ../greetercontacts.cpp)
+set_target_properties(GreeterContactsTestExe PROPERTIES COMPILE_DEFINITIONS "AS_BUSNAME=sessionBus;CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
+qt5_use_modules(GreeterContactsTestExe Contacts Core DBus Test)
+
+add_test(NAME GreeterContactsTest
+    COMMAND env
+        LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/libsystem.so
+        dbus-test-runner
+        --task ${CMAKE_CURRENT_BINARY_DIR}/GreeterContactsTestServerExe
+        --task-name server
+        --ignore-return
+        --task ${CMAKE_CURRENT_BINARY_DIR}/GreeterContactsTestExe
+        --task-name test
+        --wait-for org.freedesktop.Accounts
+    DEPENDENCIES GreeterContactsTestServerExe GreeterContactsTestExe GreeterContactsLibSystem
+    )

=== added file 'approver/tests/GreeterContactsTest.cpp'
--- approver/tests/GreeterContactsTest.cpp	1970-01-01 00:00:00 +0000
+++ approver/tests/GreeterContactsTest.cpp	2014-01-29 15:16:53 +0000
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "greetercontacts.h"
+
+#include <QContact>
+#include <QContactAvatar>
+#include <QContactName>
+#include <QContactPhoneNumber>
+#include <QDBusInterface>
+#include <QDBusPendingCallWatcher>
+#include <QDBusReply>
+#include <QObject>
+#include <QtTest>
+#include <QUrl>
+
+Q_DECLARE_METATYPE(QtContacts::QContact) // for QVariant's benefit
+
+QTCONTACTS_USE_NAMESPACE
+
+class GreeterContactsTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    GreeterContactsTest();
+
+public Q_SLOTS:
+    void setFilter();
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanup();
+    void testContactToMap();
+    void testMapToContact();
+    void testInitialValues();
+    void testSignalOnFilter();
+    void testSignalOnEntry();
+    void testSignalOnEntryInvalidated();
+    void testSignalOnContacts();
+    void testSignalOnContactsInvalidated();
+    void testEmitContact();
+
+private:
+    void waitForUpdatedSignal(bool convertedPath = false);
+    void makeGreeterContacts();
+    void waitForInitialQuery();
+    QContact makeTestContact(bool convertedPath = false);
+    QVariantMap makeTestMap();
+    void setActiveEntry(const QString &entry);
+    void setCurrentContact(const QVariantMap &map);
+    void setUseInvalidated(const QString &path, const QString &interface, bool useInvalidated);
+
+    GreeterContacts *mGreeterContacts;
+    QSignalSpy *mSpy;
+};
+
+
+
+GreeterContactsTest::GreeterContactsTest()
+: QObject()
+{
+}
+
+void GreeterContactsTest::initTestCase()
+{
+    mGreeterContacts = NULL;
+    mSpy = NULL;
+    qRegisterMetaType<QContact>();
+}
+
+void GreeterContactsTest::cleanup()
+{
+    if (mSpy) {
+        delete mSpy;
+        mSpy = NULL;
+    }
+    if (mGreeterContacts) {
+        delete mGreeterContacts;
+        mGreeterContacts = NULL;
+    }
+
+    setActiveEntry("");
+    setCurrentContact(QVariantMap());
+    setUseInvalidated("/list", "com.canonical.UnityGreeter.List", false);
+    setUseInvalidated("/org/freedesktop/Accounts/User12345", "com.canonical.TelephonyServiceApprover", false);
+}
+
+void GreeterContactsTest::testContactToMap()
+{
+    QVariantMap map = GreeterContacts::contactToMap(makeTestContact());
+    QVariantMap expectedMap = makeTestMap();
+    QCOMPARE(map, expectedMap);
+}
+
+void GreeterContactsTest::testMapToContact()
+{
+    QContact contact = GreeterContacts::mapToContact(makeTestMap());
+    QContact expectedContact = makeTestContact();
+    QCOMPARE(contact, expectedContact);
+}
+
+void GreeterContactsTest::testInitialValues()
+{
+    setActiveEntry("testuser");
+    setCurrentContact(makeTestMap());
+    makeGreeterContacts();
+    setFilter();
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testSignalOnFilter()
+{
+    setActiveEntry("testuser");
+    setCurrentContact(makeTestMap());
+    makeGreeterContacts();
+    waitForInitialQuery();
+    // setFilter might immediately send the signal, so wait until we can start the spy
+    QTimer::singleShot(0, this, SLOT(setFilter()));
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testSignalOnEntry()
+{
+    setCurrentContact(makeTestMap());
+    makeGreeterContacts();
+    setFilter();
+    waitForInitialQuery();
+    setActiveEntry("testuser");
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testSignalOnEntryInvalidated()
+{
+    setCurrentContact(makeTestMap());
+    makeGreeterContacts();
+    setFilter();
+    waitForInitialQuery();
+    setUseInvalidated("/list", "com.canonical.UnityGreeter.List", true);
+    setActiveEntry("testuser");
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testSignalOnContacts()
+{
+    setActiveEntry("testuser");
+    makeGreeterContacts();
+    setFilter();
+    waitForInitialQuery();
+    setCurrentContact(makeTestMap());
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testSignalOnContactsInvalidated()
+{
+    setActiveEntry("testuser");
+    makeGreeterContacts();
+    setFilter();
+    waitForInitialQuery();
+    setUseInvalidated("/org/freedesktop/Accounts/User12345", "com.canonical.TelephonyServiceApprover", true);
+    setCurrentContact(makeTestMap());
+    waitForUpdatedSignal();
+}
+
+void GreeterContactsTest::testEmitContact()
+{
+    setActiveEntry("testuser");
+    makeGreeterContacts();
+    setFilter();
+    waitForInitialQuery();
+    // this next line acts like setCurrentContact() because uid is set to 12345
+    GreeterContacts::emitContact(makeTestContact());
+    waitForUpdatedSignal(true);
+}
+
+QVariantMap GreeterContactsTest::makeTestMap()
+{
+    QVariantMap map;
+    map.insert("FirstName", QVariant("First"));
+    map.insert("Image", QVariant(CMAKE_SOURCE_DIR "/icons/hicolor/48x48/apps/telephony-service-call.png"));
+    map.insert("LastName", QVariant("Last"));
+    map.insert("PhoneNumber", QVariant("555"));
+    return map;
+}
+
+QContact GreeterContactsTest::makeTestContact(bool convertedPath)
+{
+    // This is the same contact that the test server will give out.
+    QContact contact;
+
+    QContactAvatar avatarDetail;
+    QString imagePath;
+    if (convertedPath) {
+        imagePath = QDir::home().filePath(".telephony-service-contact-image");
+    } else {
+        imagePath = CMAKE_SOURCE_DIR "/icons/hicolor/48x48/apps/telephony-service-call.png";
+    }
+    avatarDetail.setValue(QContactAvatar::FieldImageUrl, QUrl::fromLocalFile(imagePath));
+    contact.saveDetail(&avatarDetail);
+
+    QContactName nameDetail;
+    nameDetail.setValue(QContactName::FieldFirstName, "First");
+    nameDetail.setValue(QContactName::FieldLastName, "Last");
+    contact.saveDetail(&nameDetail);
+
+    QContactPhoneNumber numberDetail;
+    numberDetail.setValue(QContactPhoneNumber::FieldNumber, "555");
+    contact.saveDetail(&numberDetail);
+
+    return contact;
+}
+
+void GreeterContactsTest::setFilter()
+{
+    mGreeterContacts->setFilter(QContactPhoneNumber::match("555"));
+}
+
+void GreeterContactsTest::setActiveEntry(const QString &entry)
+{
+    QDBusInterface iface("com.canonical.UnityGreeter",
+                         "/list",
+                         "org.freedesktop.DBus.Properties",
+                         QDBusConnection::sessionBus());
+    QDBusReply<void> reply = iface.call("Set", "com.canonical.UnityGreeter.List", "ActiveEntry", QVariant::fromValue(QDBusVariant(QVariant(entry))));
+    QVERIFY(reply.isValid());
+}
+
+void GreeterContactsTest::setCurrentContact(const QVariantMap &map)
+{
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         "/org/freedesktop/Accounts/User12345",
+                         "org.freedesktop.DBus.Properties",
+                         QDBusConnection::sessionBus());
+    QDBusReply<void> reply = iface.call("Set", "com.canonical.TelephonyServiceApprover", "CurrentContact", QVariant::fromValue(QDBusVariant(QVariant(map))));
+    QVERIFY(reply.isValid());
+}
+
+void GreeterContactsTest::waitForInitialQuery()
+{
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         "/org/freedesktop/Accounts/User12345",
+                         "com.canonical.TelephonyServiceApprover",
+                         QDBusConnection::sessionBus());
+    QSignalSpy spy(&iface, SIGNAL(InitialQueriesDone()));
+    QVERIFY(spy.wait());
+    QCOMPARE(spy.count(), 1);
+}
+
+void GreeterContactsTest::makeGreeterContacts()
+{
+    mGreeterContacts = new GreeterContacts();
+    mSpy = new QSignalSpy(mGreeterContacts, SIGNAL(contactUpdated(QtContacts::QContact)));
+}
+
+void GreeterContactsTest::waitForUpdatedSignal(bool convertedPath)
+{
+    QVERIFY(mSpy->wait());
+    QCOMPARE(mSpy->count(), 1);
+
+    QList<QVariant> arguments = mSpy->takeFirst();
+    QContact expectedContact = makeTestContact(convertedPath);
+    QCOMPARE(arguments.at(0).value<QContact>(), expectedContact);
+}
+
+void GreeterContactsTest::setUseInvalidated(const QString &path, const QString &interface, bool useInvalidated)
+{
+    QDBusInterface iface("org.freedesktop.Accounts",
+                         path,
+                         interface,
+                         QDBusConnection::sessionBus());
+    QDBusReply<void> reply = iface.call("SetUseInvalidated", useInvalidated);
+    QVERIFY(reply.isValid());
+}
+
+QTEST_MAIN(GreeterContactsTest)
+#include "GreeterContactsTest.moc"

=== added file 'approver/tests/GreeterContactsTestServer.cpp'
--- approver/tests/GreeterContactsTestServer.cpp	1970-01-01 00:00:00 +0000
+++ approver/tests/GreeterContactsTestServer.cpp	2014-01-29 15:16:53 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusObjectPath>
+#include <QObject>
+#include <QStringList>
+
+
+#include <QDebug>
+bool listGetCalled = false;
+bool userGetCalled = false;
+
+class AccountsInterface : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Accounts")
+
+public:
+    AccountsInterface(QObject *parent = 0);
+
+    Q_SCRIPTABLE QList<QDBusObjectPath> ListCachedUsers() const;
+};
+
+
+class TelepathyInterface : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.TelephonyServiceApprover")
+
+    Q_PROPERTY(QVariantMap CurrentContact READ CurrentContact WRITE SetCurrentContact)
+
+Q_SIGNALS:
+    Q_SCRIPTABLE void InitialQueriesDone(); // Only for testing
+
+public:
+    TelepathyInterface(QObject *parent = 0);
+
+    QVariantMap CurrentContact();
+    void SetCurrentContact(const QVariantMap &map);
+
+    Q_SCRIPTABLE void SetUseInvalidated(bool useInvalidated); // only for testing
+    bool mGetCalled; // only for testing
+
+private:
+    QVariantMap mCurrentContact;
+    bool mUseInvalidated;
+};
+
+
+class ListInterface : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.UnityGreeter.List")
+
+    Q_PROPERTY(QString ActiveEntry READ ActiveEntry WRITE SetActiveEntry)
+
+public:
+    ListInterface(TelepathyInterface *telepathyInterface, QObject *parent = 0);
+
+    QString ActiveEntry() const;
+    void SetActiveEntry(const QString &entry);
+
+    Q_SCRIPTABLE void SetUseInvalidated(bool useInvalidated); // only for testing
+    bool mGetCalled; // only for testing
+
+private:
+    QString mActiveEntry;
+    TelepathyInterface *mTelepathyInterface;
+    bool mUseInvalidated;
+};
+
+
+
+AccountsInterface::AccountsInterface(QObject *parent)
+: QObject(parent)
+{
+}
+
+QList<QDBusObjectPath> AccountsInterface::ListCachedUsers() const
+{
+    return QList<QDBusObjectPath>() << QDBusObjectPath("/org/freedesktop/Accounts/User12345");
+}
+
+TelepathyInterface::TelepathyInterface(QObject *parent)
+: QObject(parent),
+  mCurrentContact(),
+  mUseInvalidated(false)
+{
+}
+
+QVariantMap TelepathyInterface::CurrentContact()
+{
+    userGetCalled = true;
+    if (userGetCalled && listGetCalled)
+        Q_EMIT InitialQueriesDone();
+    return mCurrentContact;
+}
+
+void TelepathyInterface::SetCurrentContact(const QVariantMap &map)
+{
+    mCurrentContact = map;
+
+    // Now send out a manual changed signal, since Qt won't do it for us.
+    QDBusMessage message;
+    message = QDBusMessage::createSignal("/org/freedesktop/Accounts/User12345",
+                                         "org.freedesktop.DBus.Properties",
+                                         "PropertiesChanged");
+    message << "com.canonical.TelephonyServiceApprover";
+    if (mUseInvalidated) {
+        QStringList invalidatedProps;
+        invalidatedProps << "CurrentContact";
+        message << QVariantMap();
+        message << invalidatedProps;
+    } else {
+        QVariantMap changedProps;
+        changedProps.insert("CurrentContact", QVariant(map));
+        message << changedProps;
+        message << QStringList();
+    }
+
+    QDBusConnection::sessionBus().send(message);
+}
+
+void TelepathyInterface::SetUseInvalidated(bool useInvalidated)
+{
+    mUseInvalidated = useInvalidated;
+}
+
+ListInterface::ListInterface(TelepathyInterface *telepathyInterface, QObject *parent)
+: QObject(parent),
+  mActiveEntry(),
+  mTelepathyInterface(telepathyInterface),
+  mUseInvalidated(false)
+{
+}
+
+QString ListInterface::ActiveEntry() const
+{
+    listGetCalled = true;
+    if (userGetCalled && listGetCalled && mTelepathyInterface)
+        Q_EMIT mTelepathyInterface->InitialQueriesDone();
+    return mActiveEntry;
+}
+
+void ListInterface::SetActiveEntry(const QString &entry)
+{
+    mActiveEntry = entry;
+
+    // Now send out a manual changed signal, since Qt won't do it for us.
+    QDBusMessage message;
+    message = QDBusMessage::createSignal("/list",
+                                         "org.freedesktop.DBus.Properties",
+                                         "PropertiesChanged");
+    message << "com.canonical.UnityGreeter.List";
+    if (mUseInvalidated) {
+        QStringList invalidatedProps;
+        invalidatedProps << "ActiveEntry";
+        message << QVariantMap();
+        message << invalidatedProps;
+    } else {
+        QVariantMap changedProps;
+        changedProps.insert("ActiveEntry", QVariant(entry));
+        message << changedProps;
+        message << QStringList();
+    }
+
+    QDBusConnection::sessionBus().send(message);
+}
+
+void ListInterface::SetUseInvalidated(bool useInvalidated)
+{
+    mUseInvalidated = useInvalidated;
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+
+    AccountsInterface accounts;
+    connection.registerObject("/org/freedesktop/Accounts", &accounts, QDBusConnection::ExportScriptableContents);
+
+    TelepathyInterface telepathy;
+    connection.registerObject("/org/freedesktop/Accounts/User12345", &telepathy, QDBusConnection::ExportScriptableContents);
+
+    ListInterface list(&telepathy);
+    connection.registerObject("/list", &list, QDBusConnection::ExportScriptableContents);
+
+    connection.registerService("com.canonical.UnityGreeter");
+    connection.registerService("org.freedesktop.Accounts");
+
+    return a.exec();
+}
+
+#include "GreeterContactsTestServer.moc"

=== added file 'approver/tests/libsystem.c'
--- approver/tests/libsystem.c	1970-01-01 00:00:00 +0000
+++ approver/tests/libsystem.c	2014-01-29 15:16:53 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This file is part of telephony-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <pwd.h>
+
+struct passwd *
+getpwnam (const char *name)
+{
+    if (strcmp(name, "testuser") != 0)
+        return 0;
+
+    static struct passwd user_passwd = {0};
+    user_passwd.pw_name = "testuser";
+    user_passwd.pw_uid = 12345;
+    user_passwd.pw_gid = 12345;
+
+    return &user_passwd;
+}
+
+uid_t getuid ()
+{
+    return 12345;
+}

=== modified file 'debian/rules'
--- debian/rules	2014-01-20 10:05:58 +0000
+++ debian/rules	2014-01-29 15:16:53 +0000
@@ -12,7 +12,10 @@
 	dh $@ --parallel --with translations
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Debug
+	# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.
+	# So until Debian bug 719148 is fixed, do it ourselves.
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Debug \
+	                     -DCMAKE_INSTALL_LOCALSTATEDIR="/var"
 
 override_dh_auto_test:
 	QT_QPA_PLATFORM=minimal CTEST_OUTPUT_ON_FAILURE=1 make -C obj-$(DEB_HOST_GNU_TYPE) test

=== modified file 'debian/telephony-service.install'
--- debian/telephony-service.install	2013-08-23 10:54:40 +0000
+++ debian/telephony-service.install	2014-01-29 15:16:53 +0000
@@ -1,6 +1,8 @@
 usr/bin/*telephony-service*
 usr/bin/ofono-setup
+usr/share/accountsservice/interfaces/*TelephonyService*.xml
 usr/share/applications/telephony-service*.desktop
+usr/share/dbus-1/interfaces/*TelephonyService*.xml
 usr/share/dbus-1/services/*TelephonyService*.service
 usr/share/icons/hicolor/*/apps/telephony-service*.png
 usr/share/icons/ubuntu-mono-dark/status/*/indicator-call.svg
@@ -9,5 +11,7 @@
 usr/share/notify-osd/icons/gnome/scalable/status/notification-group-call.svg
 usr/share/notify-osd/icons/gnome/scalable/status/notification-unavailable-image-call.svg
 usr/share/notify-osd/icons/gnome/scalable/status/notification-unknown-call.svg
+usr/share/polkit-1/actions/*TelephonyService*.policy
 usr/share/telepathy/clients/TelephonyService*.client
 usr/share/telephony-service/assets/*
+var/lib/polkit-1/localauthority/10-vendor.d/*TelephonyService*.pkla

=== modified file 'libtelephonyservice/contactutils.cpp'
--- libtelephonyservice/contactutils.cpp	2013-08-13 22:25:18 +0000
+++ libtelephonyservice/contactutils.cpp	2014-01-29 15:16:53 +0000
@@ -33,6 +33,8 @@
     return instance;
 }
 
+// Note: update GreeterContacts::mapToContact() if this function is modified
+// to use more than just first and last names.
 QString formatContactName(const QContact &contact)
 {
     QContactName name = contact.detail<QContactName>();