Commit d44f89f8 authored by Debarshi Ray's avatar Debarshi Ray
Browse files

Remove Telepathy support

The Empathy / Telepathy stack is no longer as strongly maintained as
it used to be, and the consensus in GNOME is to deprecate it.
Moreover, the Telepathy integration in GOA doesn't actually buy the
user any benefits. The original plan was to disable Empathy's own
account management UI (ie. empathy-accounts), but that never happened.
So, we ended up with two UIs, which at times had slightly divergent
behaviour - Microsoft account added via OAuth2 / XMPP versus raw
passwords / legacy pre-XMPP protocol.

These days we have Polari, which also has its own accounts UI, which
is in keeping with its status as a non-core application.

https://bugzilla.gnome.org/show_bug.cgi?id=795322
parent 18b3a968
[submodule "telepathy-account-widgets"]
path = telepathy-account-widgets
url = https://git.gnome.org/browse/telepathy-account-widgets
NULL =
SUBDIRS = data
if BUILD_BACKEND
if BUILD_TELEPATHY
SUBDIRS += telepathy-account-widgets
endif
endif
SUBDIRS += src
SUBDIRS = data src
if BUILD_BACKEND
SUBDIRS += doc
......@@ -19,7 +11,7 @@ SUBDIRS += po
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS=--enable-introspection --enable-gtk-doc --enable-telepathy
DISTCHECK_CONFIGURE_FLAGS=--enable-introspection --enable-gtk-doc
MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
......
......@@ -22,12 +22,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
echo "" >&2
fi
git submodule update --init --recursive || exit 1
cd $srcdir/telepathy-account-widgets
NOCONFIGURE=1 sh autogen.sh
cd ..
aclocal --install || exit 1
gtkdocize --copy || exit 1
autoreconf --verbose --force --install || exit 1
......
......@@ -98,18 +98,6 @@ GOBJECT_INTROSPECTION_CHECK([0.6.2])
VAPIGEN_CHECK()
# Telepathy
AC_DEFINE(GOA_TELEPATHY_NAME, ["telepathy"], [ProviderType and extension point name])
AC_ARG_ENABLE([telepathy],
[AS_HELP_STRING([--enable-telepathy],
[Enable Telepathy IM provider])],
[],
[enable_telepathy=no])
if test "$enable_telepathy" != "no"; then
AC_DEFINE(GOA_TELEPATHY_ENABLED, 1, [Enable Telepathy data provider])
fi
AM_CONDITIONAL(BUILD_TELEPATHY, [test x$enable_telepathy != xno])
AC_ARG_ENABLE([backend],
[AS_HELP_STRING([--enable-backend],
[Enable goabackend library])],
......@@ -147,33 +135,6 @@ if test "$enable_backend" != "no"; then
PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
if test "$enable_telepathy" != "no"; then
PKG_CHECK_MODULES(TP, [telepathy-glib])
AC_SUBST(TP_CFLAGS)
AC_SUBST(TP_LIBS)
# telepathy-account-widgets
prev_top_build_prefix=$ac_top_build_prefix
prev_ac_configure_args=$ac_configure_args
ac_configure_args="$ac_configure_args --with-cheese=no --disable-gudev --enable-ubuntu-online-accounts=no"
# install the data together with the rest of GOA's data
ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/gnome-online-accounts"
# GOA ships its icons directly in ${datadir}/icons (usually /usr/share/icons/) and not
# in its own data directory
ac_configure_args="$ac_configure_args --with-icondir=${datadir}/icons"
# Change the name of tpaw's .mo files to avoid conflicts with other packages using tp-aw
ac_configure_args="$ac_configure_args --with-gettext-package=gnome-online-accounts-tpaw"
# Disable the installation of the GSettings schema to avoid multiple components shipping
# the same file. See https://bugzilla.gnome.org/show_bug.cgi?id=706803
ac_configure_args="$ac_configure_args --disable-schemas-compile --disable-settings"
AX_CONFIG_DIR([telepathy-account-widgets])
ac_top_build_prefix=$prev_top_build_prefix
ac_configure_args=$prev_ac_configure_args
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
fi
fi
AC_ARG_ENABLE([inspector],
......@@ -612,7 +573,6 @@ echo "
Facebook provider: ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id})
Todoist provider: ${enable_todoist} (OAuth 2.0, id:${with_todoist_client_id} secret:${with_todoist_client_secret})
Windows Live provider: ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id})
Telepathy provider: ${enable_telepathy}
Pocket provider: ${enable_pocket} (id:${with_pocket_client_id})
Last.fm provider: ${enable_lastfm} (id:${with_lastfm_client_id} secret:${with_lastfm_client_secret})
......
......@@ -19,7 +19,6 @@ src/goabackend/goaowncloudprovider.c
src/goabackend/goapocketprovider.c
src/goabackend/goaprovider.c
src/goabackend/goasmtpauth.c
src/goabackend/goatelepathyprovider.c
src/goabackend/goatodoistprovider.c
src/goabackend/goautils.c
src/goabackend/goawebview.c
......
# List of files where to skip translations.
# Please keep this file sorted alphabetically.
data/goa-daemon.desktop.in
telepathy-account-widgets
......@@ -110,14 +110,6 @@ libgoa_backend_1_0_la_SOURCES += \
goakerberosprovider.h goakerberosprovider.c
endif
if BUILD_TELEPATHY
libgoa_backend_1_0_la_SOURCES += \
goatelepathyfactory.h goatelepathyfactory.c \
goatelepathyprovider.h goatelepathyprovider.c \
goatpaccountlinker.h goatpaccountlinker.c \
$(NULL)
endif
libgoa_backend_1_0_la_CFLAGS = \
$(WEBKIT_GTK_CFLAGS) \
$(JSON_GLIB_CFLAGS) \
......
......@@ -69,9 +69,6 @@ get_provider_features (GoaProvider *provider)
GOA_PROVIDER_FEATURE_MAIL |
GOA_PROVIDER_FEATURE_CALENDAR |
GOA_PROVIDER_FEATURE_CONTACTS |
#ifdef GOA_TELEPATHY_ENABLED
GOA_PROVIDER_FEATURE_CHAT |
#endif
GOA_PROVIDER_FEATURE_DOCUMENTS |
GOA_PROVIDER_FEATURE_PHOTOS |
GOA_PROVIDER_FEATURE_FILES |
......@@ -130,11 +127,6 @@ get_scope (GoaOAuth2Provider *oauth2_provider)
/* Google Cloud Print */
"https://www.googleapis.com/auth/cloudprint "
#ifdef GOA_TELEPATHY_ENABLED
/* Google Talk */
"https://www.googleapis.com/auth/googletalk "
#endif
/* Google Tasks - undocumented */
"https://www.googleapis.com/auth/tasks";
}
......@@ -288,7 +280,6 @@ build_object (GoaProvider *provider,
gboolean mail_enabled;
gboolean calendar_enabled;
gboolean contacts_enabled;
gboolean chat_enabled;
gboolean documents_enabled;
gboolean files_enabled;
gboolean photos_enabled;
......@@ -352,10 +343,6 @@ build_object (GoaProvider *provider,
contacts_enabled,
FALSE);
/* Chat */
chat_enabled = g_key_file_get_boolean (key_file, group, "ChatEnabled", NULL);
goa_object_skeleton_attach_chat (object, chat_enabled);
/* Documents */
documents_enabled = g_key_file_get_boolean (key_file, group, "DocumentsEnabled", NULL);
goa_object_skeleton_attach_documents (object, documents_enabled);
......@@ -379,7 +366,6 @@ build_object (GoaProvider *provider,
goa_account_set_mail_disabled (account, !mail_enabled);
goa_account_set_calendar_disabled (account, !calendar_enabled);
goa_account_set_contacts_disabled (account, !contacts_enabled);
goa_account_set_chat_disabled (account, !chat_enabled);
goa_account_set_documents_disabled (account, !documents_enabled);
goa_account_set_photos_disabled (account, !photos_enabled);
goa_account_set_files_disabled (account, !files_enabled);
......@@ -397,10 +383,6 @@ build_object (GoaProvider *provider,
"notify::contacts-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "ContactsEnabled");
g_signal_connect (account,
"notify::chat-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "ChatEnabled");
g_signal_connect (account,
"notify::documents-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
......@@ -436,7 +418,6 @@ add_account_key_values (GoaOAuth2Provider *oauth2_provider,
g_variant_builder_add (builder, "{ss}", "MailEnabled", "true");
g_variant_builder_add (builder, "{ss}", "CalendarEnabled", "true");
g_variant_builder_add (builder, "{ss}", "ContactsEnabled", "true");
g_variant_builder_add (builder, "{ss}", "ChatEnabled", "true");
g_variant_builder_add (builder, "{ss}", "DocumentsEnabled", "true");
g_variant_builder_add (builder, "{ss}", "PhotosEnabled", "true");
g_variant_builder_add (builder, "{ss}", "FilesEnabled", "true");
......
......@@ -132,34 +132,6 @@ goa_object_skeleton_attach_documents (GoaObjectSkeleton *object,
g_clear_object (&documents);
}
void
goa_object_skeleton_attach_chat (GoaObjectSkeleton *object,
gboolean chat_enabled)
{
#ifdef GOA_TELEPATHY_ENABLED
GoaChat *chat;
chat = goa_object_get_chat (GOA_OBJECT (object));
if (chat_enabled)
{
if (chat == NULL)
{
chat = goa_chat_skeleton_new ();
goa_object_skeleton_set_chat (object, chat);
}
}
else
{
if (chat != NULL)
goa_object_skeleton_set_chat (object, NULL);
}
g_clear_object (&chat);
#else
g_debug("Compiled without Telepathy support, chat is disabled");
goa_object_skeleton_set_chat (object, NULL);
#endif
}
void
goa_object_skeleton_attach_photos (GoaObjectSkeleton *object,
gboolean photos_enabled)
......
......@@ -33,9 +33,6 @@ void goa_object_skeleton_attach_calendar (GoaObjectSkeleton *o
gboolean calendar_enabled,
gboolean accept_ssl_errors);
void goa_object_skeleton_attach_chat (GoaObjectSkeleton *object,
gboolean chat_enabled);
void goa_object_skeleton_attach_contacts (GoaObjectSkeleton *object,
const gchar *uri,
gboolean contacts_enabled,
......
......@@ -31,7 +31,6 @@
#include "goaflickrprovider.h"
#include "goafoursquareprovider.h"
#include "goawindowsliveprovider.h"
#include "goatelepathyfactory.h"
#include "goapocketprovider.h"
#include "goamediaserverprovider.h"
#include "goalastfmprovider.h"
......@@ -994,9 +993,6 @@ static struct
#endif
#ifdef GOA_MEDIA_SERVER_ENABLED
{ GOA_MEDIA_SERVER_NAME, goa_media_server_provider_get_type },
#endif
#ifdef GOA_TELEPATHY_ENABLED
{ GOA_TELEPATHY_NAME, goa_telepathy_factory_get_type },
#endif
{ NULL, NULL }
};
......
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright © 2013 Intel Corporation
*
* 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 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 "config.h"
#include <tp-account-widgets/tpaw-protocol.h>
#include "goatelepathyfactory.h"
#include "goaprovider-priv.h"
#include "goatelepathyprovider.h"
/*
* SECTION:goatelepathyfactory
* @title: GoaTelepathyFactory
* @short_description: Factory for #GoaTelepathyProvider instances
*
* #GoaTelepathyFactory dynamically creates instances of #GoaTelepathyProvider
* based on the protocols available through Telepathy.
*
* It accepts the protocol names from the Telepathy specification as
* @provider_name in goa_provider_factory_get_provider().
*/
G_DEFINE_TYPE_WITH_CODE (GoaTelepathyFactory, goa_telepathy_factory, GOA_TYPE_PROVIDER_FACTORY,
goa_provider_ensure_extension_points_registered ();
g_io_extension_point_implement (GOA_PROVIDER_FACTORY_EXTENSION_POINT_NAME,
g_define_type_id,
GOA_TELEPATHY_NAME,
0));
/* ---------------------------------------------------------------------------------------------------- */
static GoaProvider *
get_provider (GoaProviderFactory *factory,
const gchar *provider_name)
{
g_return_val_if_fail (GOA_IS_TELEPATHY_FACTORY (factory), NULL);
return GOA_PROVIDER (goa_telepathy_provider_new_from_protocol_name (provider_name));
}
/* ---------------------------------------------------------------------------------------------------- */
static void
free_list_and_unref (gpointer data)
{
g_list_free_full (data, g_object_unref);
}
static void
get_protocols_cb (GObject *source,
GAsyncResult *res,
gpointer user_data)
{
GTask *outer_task = user_data;
GList *protocols = NULL;
GList *ret;
GList *l;
GError *error = NULL;
GQuark facebook_quark;
#if GOA_GOOGLE_ENABLED
GQuark google_talk_quark;
#endif
if (!tpaw_protocol_get_all_finish (&protocols, res, &error))
{
g_task_return_error (outer_task, error);
g_object_unref (outer_task);
return;
}
facebook_quark = g_quark_from_static_string ("facebook");
#if GOA_GOOGLE_ENABLED
google_talk_quark = g_quark_from_static_string ("google-talk");
#endif
ret = NULL;
for (l = protocols; l != NULL; l = l->next)
{
TpawProtocol *protocol = l->data;
const gchar *service_name = tpaw_protocol_get_service_name (protocol);
GQuark service_quark = g_quark_try_string (service_name);
GoaTelepathyProvider *provider;
/* This service does not exist anymore, so skip it. */
if (service_quark == facebook_quark)
continue;
/* If the service is handled natively by GOA, so we don't allow
* the creation of a Telepathy-only account. */
#if GOA_GOOGLE_ENABLED
if (service_quark == google_talk_quark)
continue;
#endif
provider = goa_telepathy_provider_new_from_protocol (protocol);
ret = g_list_prepend (ret, provider);
}
ret = g_list_reverse (ret);
g_list_free_full (protocols, g_object_unref);
g_task_return_pointer (outer_task, ret, free_list_and_unref);
g_object_unref (outer_task);
}
static void
get_providers (GoaProviderFactory *factory,
GAsyncReadyCallback callback,
gpointer user_data)
{
GTask *task;
g_return_if_fail (GOA_IS_TELEPATHY_FACTORY (factory));
task = g_task_new (factory, NULL, callback, user_data);
tpaw_protocol_get_all_async (get_protocols_cb, task);
}
/* ---------------------------------------------------------------------------------------------------- */
static void
goa_telepathy_factory_init (GoaTelepathyFactory *provider)
{
}
static void
goa_telepathy_factory_class_init (GoaTelepathyFactoryClass *klass)
{
GoaProviderFactoryClass *factory_class;
factory_class = GOA_PROVIDER_FACTORY_CLASS (klass);
factory_class->get_provider = get_provider;
factory_class->get_providers = get_providers;
}
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright © 2013 Intel Corporation
*
* 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 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/>.
*/
#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
#error "Only <goabackend/goabackend.h> can be included directly."
#endif
#ifndef __GOA_TELEPATHY_FACTORY_H__
#define __GOA_TELEPATHY_FACTORY_H__
#include "goaproviderfactory.h"
G_BEGIN_DECLS
#define GOA_TYPE_TELEPATHY_FACTORY (goa_telepathy_factory_get_type ())
#define GOA_TELEPATHY_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_TELEPATHY_FACTORY, GoaTelepathyFactory))
#define GOA_TELEPATHY_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GOA_TYPE_TELEPATHY_FACTORY, GoaTelepathyFactoryClass))
#define GOA_TELEPATHY_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOA_TYPE_TELEPATHY_FACTORY, GoaTelepathyFactoryClass))
#define GOA_IS_TELEPATHY_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_TELEPATHY_FACTORY))
#define GOA_IS_TELEPATHY_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GOA_TYPE_TELEPATHY_FACTORY))
typedef struct _GoaTelepathyFactory GoaTelepathyFactory;
typedef struct _GoaTelepathyFactoryClass GoaTelepathyFactoryClass;
struct _GoaTelepathyFactory
{
/*< private >*/
GoaProviderFactory parent_instance;
};
struct _GoaTelepathyFactoryClass
{
GoaProviderFactoryClass parent_class;
};
GType goa_telepathy_factory_get_type (void) G_GNUC_CONST;
G_END_DECLS
#endif /* __GOA_TELEPATHY_FACTORY_H__ */
This diff is collapsed.
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright © 2012 – 2017 Red Hat, Inc.
* Copyright © 2013 Intel Corporation
*
* 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 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/>.
*/
#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
#error "Only <goabackend/goabackend.h> can be included directly."
#endif
#ifndef __GOA_TELEPATHY_PROVIDER_H__
#define __GOA_TELEPATHY_PROVIDER_H__
#include <glib-object.h>
#include <tp-account-widgets/tpaw-protocol.h>
G_BEGIN_DECLS
#define GOA_TYPE_TELEPATHY_PROVIDER (goa_telepathy_provider_get_type ())
#define GOA_TELEPATHY_PROVIDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_TELEPATHY_PROVIDER, GoaTelepathyProvider))
#define GOA_IS_TELEPATHY_PROVIDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_TELEPATHY_PROVIDER))
typedef struct _GoaTelepathyProvider GoaTelepathyProvider;
GType goa_telepathy_provider_get_type (void) G_GNUC_CONST;
GoaTelepathyProvider *goa_telepathy_provider_new_from_protocol_name (const gchar *protocol_name);
GoaTelepathyProvider *goa_telepathy_provider_new_from_protocol (TpawProtocol *protocol);
G_END_DECLS
#endif /* __GOA_TELEPATHY_PROVIDER_H__ */
This diff is collapsed.
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright © 2010 – 2013 Collabora Ltd.
* Copyright © 2013 Intel Corporation
*
* 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 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/>.
*/
#ifndef __GOA_TP_ACCOUNT_LINKER_H__
#define __GOA_TP_ACCOUNT_LINKER_H__
#include <glib-object.h>
#include "goa/goa.h"
G_BEGIN_DECLS
#define GOA_TYPE_TP_ACCOUNT_LINKER (goa_tp_account_linker_get_type ())
#define GOA_TP_ACCOUNT_LINKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GOA_TYPE_TP_ACCOUNT_LINKER, GoaTpAccountLinker))
#define GOA_TP_ACCOUNT_LINKER_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GOA_TYPE_TP_ACCOUNT_LINKER, GoaTpAccountLinkerClass))
#define GOA_IS_TP_ACCOUNT_LINKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GOA_TYPE_TP_ACCOUNT_LINKER))
#define GOA_IS_TP_ACCOUNT_LINKER_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), GOA_TYPE_TP_ACCOUNT_LINKER))
#define GOA_TP_ACCOUNT_LINKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GOA_TYPE_TP_ACCOUNT_LINKER, GoaTpAccountLinkerClass))
typedef struct _GoaTpAccountLinker GoaTpAccountLinker;
typedef struct _GoaTpAccountLinkerClass GoaTpAccountLinkerClass;
typedef struct _GoaTpAccountLinkerPrivate GoaTpAccountLinkerPrivate;
struct _GoaTpAccountLinker
{
GObject parent_instance;
GoaTpAccountLinkerPrivate *priv;
};
struct _GoaTpAccountLinkerClass
{
GObjectClass parent_class;
};
GType goa_tp_account_linker_get_type (void) G_GNUC_CONST;
GoaTpAccountLinker *goa_tp_account_linker_new (void);
void goa_tp_account_linker_remove_tp_account (GoaTpAccountLinker *self,
GoaObject *object,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean goa_tp_account_linker_remove_tp_account_finish (GoaTpAccountLinker *self,
GAsyncResult *res,
GError **error);
G_END_DECLS
#endif
......@@ -21,10 +21,6 @@
#include <glib/gi18n-lib.h>
#include <libsecret/secret.h>
#ifdef GOA_TELEPATHY_ENABLED
#include <telepathy-glib/telepathy-glib.h>
#endif
#include "goautils.h"
static const SecretSchema secret_password_schema =
......@@ -199,42 +195,6 @@ goa_utils_account_add_header (GoaObject *object, GtkGrid *grid, gint row)
gtk_grid_attach (grid, label, 1, row, 3, 1);
}
void
goa_utils_initialize_client_factory (void)
{
static gsize once_init_value = 0;
if (g_once_init_enter (&once_init_value))
{
#ifdef GOA_TELEPATHY_ENABLED
TpSimpleClientFactory *factory;
TpAccountManager *account_manager;
GQuark account_features[] = {TP_ACCOUNT_FEATURE_ADDRESSING,
TP_ACCOUNT_FEATURE_STORAGE,
TP_ACCOUNT_FEATURE_CONNECTION,
0};
GQuark connection_features[] = {TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS,
TP_CONNECTION_FEATURE_CONTACT_INFO,
0};
/* We make sure that new instances of Telepathy objects will have all
* the features we need.