Merge lp:~tiagosh/telepathy-ofono/add-ril-mc-plugin into lp:telepathy-ofono

[Tiago Salem Herrmann]

Add mc-plugin to provision ril modem accounts.

Add mc-plugin to provision ril modem accounts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/157/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/157/rebuild

review: Approve (continuous-integration)

[lp:~tiagosh/telepathy-ofono/add-ril-mc-plugin]

140. By Tiago Salem Herrmann on 2015-05-19

Change tests to use the mission control plugin

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/158/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telepathy-ofono/add-ril-mc-plugin]

141. By Tiago Salem Herrmann on 2015-05-19

replace killall by pgrep+kill and also kill mission control

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/159/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/159/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telepathy-ofono/add-ril-mc-plugin]

142. By Tiago Salem Herrmann on 2015-05-19

enable test debug

143. By Tiago Salem Herrmann on 2015-05-19

wait until instances are running

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/160/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/160/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/161/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/161/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/telepathy-ofono/add-ril-mc-plugin]

144. By Tiago Salem Herrmann on 2015-05-19

add more debugs

145. By Tiago Salem Herrmann on 2015-05-19

dont fail if gsettings schema isn't installed

146. By Tiago Salem Herrmann on 2015-05-19

check if schema is available

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/162/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality 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

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-22 09:15:36 +0000
+++ CMakeLists.txt	2015-05-19 14:32:26 +0000
@@ -37,6 +37,7 @@
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
 pkg_check_modules(SQLITE3 REQUIRED sqlite3)
+pkg_check_modules(MC_PLUGINS REQUIRED mission-control-plugins)
 
 pkg_check_modules(PULSEAUDIO libpulse)
 if (PULSEAUDIO_FOUND)
@@ -117,3 +118,4 @@
 
 add_subdirectory(schema)
 add_subdirectory(tests)
+add_subdirectory(mc-plugin)

=== modified file 'debian/control'
--- debian/control	2013-12-11 14:52:03 +0000
+++ debian/control	2015-05-19 14:32:26 +0000
@@ -7,6 +7,7 @@
                dbus-test-runner,
                dconf-cli,
                gnome-keyring,
+               libmission-control-plugins-dev (>= 1:5.14.0),
                libofono-qt-dev (>= 1.5),
                libqt5sql5-sqlite,
                libtelepathy-qt5-dev (>= 0.9.3),
@@ -33,3 +34,13 @@
  telepathy-ofono is a Telepathy connection manager that makes it possible for
  Telepathy clients to communicate using oFono modems, enabling features like
  real phone calls and send and receive SMSs.
+
+Package: telepathy-ofono-ril-mc-plugin
+Architecture: any
+Depends: telepathy-ofono,
+         ${misc:Depends},
+         ${shlibs:Depends},
+         libhybris-utils
+Description: telepathy oFono mission control plugin for ril modems
+ This telepathy mission-control plugin is used to automatically provision
+ telepathy-ofono accounts for each available ril modem.

=== modified file 'debian/copyright'
--- debian/copyright	2013-12-04 14:31:39 +0000
+++ debian/copyright	2015-05-19 14:32:26 +0000
@@ -23,6 +23,12 @@
 Copyright: 2010 Nokia Corporation and/or its subsidiary(-ies).
 License: LGPL-2.1+
 
+Files: mc-plugin/*
+Copyright: 2015 Canonical Ltd
+           2012 Jolla Ltd
+           2012 Collabora Ltd
+License: LGPL-2.1+
+
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

=== added file 'debian/telepathy-ofono-ril-mc-plugin.install'
--- debian/telepathy-ofono-ril-mc-plugin.install	1970-01-01 00:00:00 +0000
+++ debian/telepathy-ofono-ril-mc-plugin.install	2015-05-19 14:32:26 +0000
@@ -0,0 +1,1 @@
+usr/*/mission-control-plugins*/mcp-account-manager-ofono.so

=== added file 'debian/telepathy-ofono.install'
--- debian/telepathy-ofono.install	1970-01-01 00:00:00 +0000
+++ debian/telepathy-ofono.install	2015-05-19 14:32:26 +0000
@@ -0,0 +1,3 @@
+usr/lib/telepathy/telepathy-ofono
+usr/share/telepathy/managers/ofono.manager
+usr/share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.ofono.service

=== added directory 'mc-plugin'
=== added file 'mc-plugin/CMakeLists.txt'
--- mc-plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ mc-plugin/CMakeLists.txt	2015-05-19 14:32:26 +0000
@@ -0,0 +1,21 @@
+set(MCP_ACCOUNT_MANAGER_NAME mcp-account-manager-ofono)
+
+set(MC_PLUGIN_SRC
+    mcp-account-manager-ofono.c
+    mission-control-plugin.c
+)
+
+set(MC_PLUGIN_HDRS
+    mcp-account-manager-ofono.h
+)
+
+execute_process(COMMAND pkg-config --variable=plugindir mission-control-plugins
+     OUTPUT_VARIABLE MC_PLUGINS_DIR)
+string(REPLACE "\n" "" MC_PLUGINS_DIR ${MC_PLUGINS_DIR})
+
+include_directories(${MC_PLUGINS_INCLUDE_DIRS})
+add_library(${MCP_ACCOUNT_MANAGER_NAME} SHARED ${MC_PLUGIN_SRC} ${MC_PLUGIN_HDRS})
+set_target_properties(${MCP_ACCOUNT_MANAGER_NAME} PROPERTIES PREFIX "")
+target_link_libraries(${MCP_ACCOUNT_MANAGER_NAME} ${MC_PLUGINS_LIBRARIES})
+
+install(TARGETS ${MCP_ACCOUNT_MANAGER_NAME} DESTINATION ${MC_PLUGINS_DIR})

=== added file 'mc-plugin/mcp-account-manager-ofono.c'
--- mc-plugin/mcp-account-manager-ofono.c	1970-01-01 00:00:00 +0000
+++ mc-plugin/mcp-account-manager-ofono.c	2015-05-19 14:32:26 +0000
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ * Contact: Tiago Salem Herrmann <[e-mail]>
+ *
+ * Based on Empathy ubuntu-online-accounts, mcp-account-manager-ring:
+ * Contact: John Brooks <[e-mail]>
+ * Copyright (C) 2012 Jolla Ltd.
+ * Copyright (C) 2012 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include "mcp-account-manager-ofono.h"
+
+#define PLUGIN_NAME "ofono-account"
+#define PLUGIN_PRIORITY (MCP_ACCOUNT_STORAGE_PLUGIN_PRIO_DEFAULT - 10)
+#define PLUGIN_DESCRIPTION "Provide ril modem accounts for telepathy-ofono"
+#define PLUGIN_PROVIDER "im.telepathy.Account.Storage.Ofono"
+
+static void account_storage_iface_init(McpAccountStorageIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (McpAccountManagerOfono, mcp_account_manager_ofono,
+    G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (MCP_TYPE_ACCOUNT_STORAGE,
+    account_storage_iface_init));
+
+struct ofono_account {
+    gchar *account_name;
+    int index;
+    GHashTable *params;
+};
+typedef struct ofono_account OfonoAccount;
+
+struct _McpAccountManagerOfonoPrivate
+{
+    GList *accounts;
+};
+
+void free_ofono_struct (gpointer data)
+{
+    OfonoAccount *account = (OfonoAccount*)data;
+    g_hash_table_unref(account->params);
+    g_free(account->account_name);
+}
+
+static void mcp_account_manager_ofono_dispose(GObject *object)
+{
+    McpAccountManagerOfono *self = (McpAccountManagerOfono*) object;
+
+    g_list_free_full(self->priv->accounts, free_ofono_struct);
+
+    G_OBJECT_CLASS (mcp_account_manager_ofono_parent_class)->dispose(object);
+}
+
+static void mcp_account_manager_ofono_init(McpAccountManagerOfono *self)
+{
+    g_debug("MC ril ofono accounts plugin initialized");
+    gchar          *output = NULL;
+    gchar          *output2 = NULL;
+    const gchar    *force_num_modems = g_getenv("FORCE_RIL_NUM_MODEMS");
+    GError         *error = NULL;
+    int            num_modems = 0;
+    int index;
+
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self, MCP_TYPE_ACCOUNT_MANAGER_OFONO,
+            McpAccountManagerOfonoPrivate);
+
+    if (force_num_modems) {
+        num_modems = atoi(force_num_modems);
+        g_debug("forced number of modems: %d", num_modems);
+    } else {
+        if (!g_file_test ("/usr/bin/getprop", G_FILE_TEST_IS_EXECUTABLE)) {
+            return;
+        }
+        if (!g_spawn_command_line_sync("/usr/bin/getprop rild.libpath ''",
+                                        &output, NULL, NULL,
+                                        &error)) {
+            g_debug("%s", error->message);
+            g_error_free (error);
+            return;
+        }
+
+        if (strlen(g_strstrip(output)) != 0) {
+            g_spawn_command_line_sync("/usr/bin/getprop ril.num_slots 1",
+                                       &output2,
+                                       NULL,
+                                       NULL,
+                                       &error);
+            num_modems = atoi(output2);
+        }
+    }
+
+    GSettings *settings = NULL;
+    GSettingsSchemaSource *source = g_settings_schema_source_get_default();
+    if (source != NULL && g_settings_schema_source_lookup(source, "com.ubuntu.phone", TRUE) != NULL) {
+        settings = g_settings_new("com.ubuntu.phone");
+    }
+    for (index = 0; index < num_modems; index++) {
+        OfonoAccount *account = (OfonoAccount*)malloc(sizeof(OfonoAccount));
+        char account_name[30] = {0};
+        char ril_modem[10] = {0};
+        account->index = index;
+        sprintf(account_name, "ofono/ofono/account%d", index);
+        sprintf(ril_modem, "/ril_%d", index);
+        account->params = g_hash_table_new(g_str_hash, g_str_equal);
+        account->account_name = g_strdup(account_name);
+        g_hash_table_insert(account->params, g_strdup("manager"), g_strdup("ofono"));
+        g_hash_table_insert(account->params, g_strdup("protocol"), g_strdup("ofono"));
+        g_hash_table_insert(account->params, g_strdup("Enabled"), g_strdup("true"));
+        g_hash_table_insert(account->params, g_strdup("ConnectAutomatically"), g_strdup("true"));
+        g_hash_table_insert(account->params, g_strdup("always_dispatch"), g_strdup("true"));
+        g_hash_table_insert(account->params, g_strdup("param-modem-objpath"), g_strdup(ril_modem));
+        if (settings) {
+            GVariant *sim_names = g_settings_get_value(settings, "sim-names");
+            if (sim_names) {
+                GVariantIter iter;
+                GVariant *value;
+                gchar *key;
+
+                g_variant_iter_init (&iter, sim_names);
+                while (g_variant_iter_next (&iter, "{ss}", &key, &value)) {
+                    if (!strcmp(key, ril_modem)) {
+                        g_hash_table_insert(account->params, g_strdup("DisplayName"), g_strdup((char *)value));
+                    }
+                    g_free (key);
+                    g_free (value);
+                }
+            }
+            if (sim_names) {
+                g_variant_unref(sim_names);
+            }
+        }
+
+        self->priv->accounts = g_list_append(self->priv->accounts, account);
+    }
+    if (settings) {
+        g_object_unref (settings);
+    }
+    if (output) {
+        g_free(output);
+    }
+    if (output2) {
+      g_free (output2);
+    }
+}
+
+static void mcp_account_manager_ofono_class_init(McpAccountManagerOfonoClass *klass)
+{
+    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+    gobject_class->dispose = mcp_account_manager_ofono_dispose;
+
+    g_type_class_add_private(gobject_class, sizeof(McpAccountManagerOfonoPrivate));
+}
+
+static GList *account_manager_ofono_list(const McpAccountStorage *storage, const McpAccountManager *am)
+{
+    McpAccountManagerOfono *self = (McpAccountManagerOfono*) storage;
+    GList *accounts = NULL;
+    OfonoAccount *account = NULL;
+    GList *l;
+    for (l = self->priv->accounts; l != NULL; l = l->next) {
+        account = (OfonoAccount*)l->data;
+        accounts = g_list_prepend(accounts, g_strdup(account->account_name));
+    }
+    return accounts;
+}
+
+static gboolean account_manager_ofono_get(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key)
+{
+    McpAccountManagerOfono *self = (McpAccountManagerOfono*) storage;
+    GList *l;
+    OfonoAccount *account = NULL;
+    int found = 0;
+    for (l = self->priv->accounts; l != NULL; l = l->next) {
+        account = (OfonoAccount*)l->data;
+        if (!strcmp(account_name, account->account_name)) {
+            found = 1; 
+            break;
+        }
+    }
+    if (!found) {
+        return FALSE;
+    }
+
+    if (key == NULL) {
+        GHashTableIter iter;
+        gpointer itkey, value;
+        g_hash_table_iter_init(&iter, account->params);
+        while (g_hash_table_iter_next(&iter, &itkey, &value)) {
+            g_debug("%s: %s, %s %s", G_STRFUNC, account_name, (char*)itkey, (char*)value);
+            mcp_account_manager_set_value(am, account_name, itkey, value);
+        }
+    } else {
+        gchar *value = g_hash_table_lookup(account->params, key);
+        g_debug("%s: %s, %s %s", G_STRFUNC, account_name, (char*)key, (char*)value);
+        mcp_account_manager_set_value(am, account_name, key, value);
+    }
+    return FALSE;
+}
+
+static gboolean account_manager_ofono_set(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key, const gchar *val)
+{
+    return FALSE;
+}
+
+static gchar *account_manager_ofono_create(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *cm_name, const gchar *protocol_name, GHashTable *params, GError **error)
+{
+    g_set_error(error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Ofono ril account manager cannot create accounts");
+    return NULL;
+}
+
+static gboolean account_manager_ofono_delete(const McpAccountStorage *storage, const McpAccountManager *am,
+        const gchar *account_name, const gchar *key)
+{
+    g_debug("%s: %s, %s", G_STRFUNC, account_name, key);
+    return FALSE;
+}
+
+static gboolean account_manager_ofono_commit(const McpAccountStorage *storage, const McpAccountManager *am)
+{
+    g_debug("%s", G_STRFUNC);
+    return FALSE;
+}
+
+static void account_manager_ofono_get_identifier(const McpAccountStorage *storage, const gchar *account_name,
+        GValue *identifier)
+{
+    McpAccountManagerOfono *self = (McpAccountManagerOfono*) storage;
+
+    GList *l;
+    OfonoAccount *account = NULL;
+    int found = 0;
+    for (l = self->priv->accounts; l != NULL; l = l->next) {
+        account = (OfonoAccount*)l->data;
+        if (!strcmp(account_name, account->account_name)) {
+            found = 1; 
+            break;
+        }
+    }
+    if (!found) {
+        return;
+    }
+
+    g_debug("%s: %s", G_STRFUNC, account_name);
+    g_value_init(identifier, G_TYPE_UINT);
+    g_value_set_uint(identifier, account->index);
+}
+
+static guint account_manager_ofono_get_restrictions(const McpAccountStorage *storage, const gchar *account_name)
+{
+    McpAccountManagerOfono *self = (McpAccountManagerOfono*) storage;
+
+    GList *l;
+    OfonoAccount *account = NULL;
+    int found = 0;
+    for (l = self->priv->accounts; l != NULL; l = l->next) {
+        account = (OfonoAccount*)l->data;
+        if (!strcmp(account_name, account->account_name)) {
+            found = 1; 
+            break;
+        }
+    }
+
+    if (!found) {
+        return G_MAXUINT;
+    }
+
+    return TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE |
+        TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE;
+}
+
+static void account_storage_iface_init(McpAccountStorageIface *iface)
+{
+    iface->name = PLUGIN_NAME;
+    iface->desc = PLUGIN_DESCRIPTION;
+    iface->priority = PLUGIN_PRIORITY;
+    iface->provider = PLUGIN_PROVIDER;
+
+#define IMPLEMENT(x) iface->x = account_manager_ofono_##x
+    IMPLEMENT (get);
+    IMPLEMENT (list);
+    IMPLEMENT (set);
+    IMPLEMENT (create);
+    IMPLEMENT (delete);
+    IMPLEMENT (commit);
+    IMPLEMENT (get_identifier);
+    IMPLEMENT (get_restrictions);
+#undef IMPLEMENT
+}
+
+McpAccountManagerOfono *mcp_account_manager_ofono_new(void)
+{
+    return g_object_new(MCP_TYPE_ACCOUNT_MANAGER_OFONO, NULL);
+}
+

=== added file 'mc-plugin/mcp-account-manager-ofono.h'
--- mc-plugin/mcp-account-manager-ofono.h	1970-01-01 00:00:00 +0000
+++ mc-plugin/mcp-account-manager-ofono.h	2015-05-19 14:32:26 +0000
@@ -0,0 +1,49 @@
+#ifndef __MCP_ACCOUNT_MANAGER_OFONO_H__
+#define __MCP_ACCOUNT_MANAGER_OFONO_H__
+
+#include <mission-control-plugins/mission-control-plugins.h>
+
+G_BEGIN_DECLS
+
+#define MCP_TYPE_ACCOUNT_MANAGER_OFONO \
+    (mcp_account_manager_ofono_get_type ())
+#define MCP_ACCOUNT_MANAGER_OFONO(o) \
+    (G_TYPE_CHECK_INSTANCE_CAST ((o), MCP_TYPE_ACCOUNT_MANAGER_OFONO,   \
+     McpAccountManagerOfono))
+
+#define MCP_ACCOUNT_MANAGER_OFONO_CLASS(k)     \
+    (G_TYPE_CHECK_CLASS_CAST((k), MCP_TYPE_ACCOUNT_MANAGER_OFONO, \
+     McpAccountManagerOfonoClass))
+
+#define MCP_IS_ACCOUNT_MANAGER_OFONO(o) \
+    (G_TYPE_CHECK_INSTANCE_TYPE ((o), MCP_TYPE_ACCOUNT_MANAGER_OFONO))
+
+#define MCP_IS_ACCOUNT_MANAGER_OFONO_CLASS(k)  \
+    (G_TYPE_CHECK_CLASS_TYPE ((k), MCP_TYPE_ACCOUNT_MANAGER_OFONO))
+
+#define MCP_ACCOUNT_MANAGER_OFONO_GET_CLASS(o) \
+    (G_TYPE_INSTANCE_GET_CLASS ((o), MCP_TYPE_ACCOUNT_MANAGER_OFONO, \
+     McpAccountManagerOfonoClass))
+
+typedef struct _McpAccountManagerOfonoPrivate McpAccountManagerOfonoPrivate;
+
+typedef struct {
+    GObject parent;
+
+    McpAccountManagerOfonoPrivate *priv;
+} _McpAccountManagerOfono;
+
+typedef struct {
+      GObjectClass parent_class;
+} _McpAccountManagerOfonoClass;
+
+typedef _McpAccountManagerOfono McpAccountManagerOfono;
+typedef _McpAccountManagerOfonoClass McpAccountManagerOfonoClass;
+
+GType mcp_account_manager_ofono_get_type (void) G_GNUC_CONST;
+
+McpAccountManagerOfono *mcp_account_manager_ofono_new (void);
+
+G_END_DECLS
+
+#endif

=== added file 'mc-plugin/mission-control-plugin.c'
--- mc-plugin/mission-control-plugin.c	1970-01-01 00:00:00 +0000
+++ mc-plugin/mission-control-plugin.c	2015-05-19 14:32:26 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012 Jolla Ltd.
+ * Contact: John Brooks <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <mission-control-plugins/mission-control-plugins.h>
+#include "mcp-account-manager-ofono.h"
+
+GObject *
+mcp_plugin_ref_nth_object (guint n)
+{
+    static void *plugin_0 = NULL;
+
+    switch (n) {
+    case 0:
+        if (plugin_0 == NULL) {
+            plugin_0 = g_object_new (MCP_TYPE_ACCOUNT_MANAGER_OFONO, NULL);
+        } else {
+            g_object_ref (plugin_0);
+        }
+        return plugin_0;
+    default:
+        return NULL;
+    }
+}
+

=== modified file 'protocol.cpp'
--- protocol.cpp	2014-09-23 09:44:37 +0000
+++ protocol.cpp	2015-05-19 14:32:26 +0000
@@ -33,7 +33,8 @@
     setCreateConnectionCallback(memFun(this, &Protocol::createConnection));
     Tp::ProtocolParameterList parameters;
     Tp::ProtocolParameter parameter("modem-objpath", "s", 0);
-    parameters << parameter;
+    Tp::ProtocolParameter parameter2("fakeEmergencyNumber", "s", 0);
+    parameters << parameter << parameter2;
 
     setParameters(parameters);
 }

=== modified file 'tests/dbus-test-wrapper.sh.in'
--- tests/dbus-test-wrapper.sh.in	2014-04-02 20:18:38 +0000
+++ tests/dbus-test-wrapper.sh.in	2015-05-19 14:32:26 +0000
@@ -1,9 +1,13 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # export the home folder to somewhere in /tmp
 TMPDIR=/tmp/tpofono_test_home
 rm -rf $TMPDIR
 export HOME=$TMPDIR
+mkdir -p $TMPDIR
+
+# copy mcp plugin to a temporary directory
+cp ${CMAKE_BINARY_DIR}/mc-plugin/mcp-account-manager-ofono.so $TMPDIR
 
 # now run gnome-keyring
 gnome-keyring-daemon -r -d
@@ -14,17 +18,22 @@
 export PA_DISABLED=1
 # start telepathy-ofono with the ofono-qt mock library
 LD_PRELOAD=@CMAKE_CURRENT_BINARY_DIR@/mock/libofono-qt.so ${CMAKE_BINARY_DIR}/telepathy-ofono &
-
 TP_OFONO_PID=$!
-
-mc-tool add ofono/ofono account0
-mc-tool enable ofono/ofono/account0
+sleep 2
+
+FORCE_RIL_NUM_MODEMS=1 MC_FILTER_PLUGIN_DIR=$TMPDIR G_MESSAGES_DEBUG=all MC_DEBUG=all MCP_DEBUG=all /usr/lib/telepathy/mission-control-5 &
+MC_CONTROL_PID=$!
+sleep 2
+
+mc-tool update ofono/ofono/account0 string:modem-objpath=/OfonoModem
+mc-tool reconnect ofono/ofono/account0
 
 $@
 RESULT=$?
 
 kill -9 $TP_OFONO_PID
+kill -9 $MC_CONTROL_PID
 #FIXME for some reason history-daemon is not being finished, so we have to kill it here
-killall history-daemon
+pgrep history-daemon | xargs kill -9
 
 return $RESULT