diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-26 10:44:30 +0100 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 11:03:05 +0100 |
commit | c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c (patch) | |
tree | 8d73e187743964fce43daeee6b3483abd88ab392 /libempathy | |
parent | 2d72679026f5f39eeffa10e474bcf151ca2002db (diff) | |
download | empathy-c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c.tar.gz |
uoa-utils: move from Empathy to tp-aw
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/Makefile.am | 2 | ||||
-rw-r--r-- | libempathy/empathy-uoa-auth-handler.c | 2 | ||||
-rw-r--r-- | libempathy/empathy-uoa-utils.c | 49 | ||||
-rw-r--r-- | libempathy/empathy-uoa-utils.h | 35 |
4 files changed, 1 insertions, 87 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index faf647a4c..d80c39523 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -93,8 +93,6 @@ goa_sources = \ uoa_sources = \ empathy-uoa-auth-handler.c \ empathy-uoa-auth-handler.h \ - empathy-uoa-utils.c \ - empathy-uoa-utils.h \ $(NULL) pkglib_LTLIBRARIES = libempathy.la diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c index eff3dd6d4..d5a6577c2 100644 --- a/libempathy/empathy-uoa-auth-handler.c +++ b/libempathy/empathy-uoa-auth-handler.c @@ -31,9 +31,9 @@ #include <libsignon-glib/signon-auth-session.h> #include <tp-account-widgets/tpaw-keyring.h> +#include <tp-account-widgets/tpaw-uoa-utils.h> #include "empathy-utils.h" -#include "empathy-uoa-utils.h" #include "empathy-sasl-mechanisms.h" #define DEBUG_FLAG EMPATHY_DEBUG_SASL diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c deleted file mode 100644 index 6032d36bd..000000000 --- a/libempathy/empathy-uoa-utils.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * empathy-uoa-utils.c - Source for UOA utilities - * Copyright (C) 2012 Collabora Ltd. - * @author Xavier Claessens <xavier.claessens@collabora.co.uk> - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "config.h" -#include "empathy-uoa-utils.h" - -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include "empathy-debug.h" - -static AgManager *singleton = NULL; - -void -empathy_uoa_manager_set_default (AgManager *manager) -{ - if (singleton != NULL) - return; - - singleton = manager; - g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton); -} - -AgManager * -empathy_uoa_manager_dup (void) -{ - if (singleton != NULL) - return g_object_ref (singleton); - - singleton = ag_manager_new_for_service_type (EMPATHY_UOA_SERVICE_TYPE); - g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton); - - return singleton; -} diff --git a/libempathy/empathy-uoa-utils.h b/libempathy/empathy-uoa-utils.h deleted file mode 100644 index 2cd7a41a2..000000000 --- a/libempathy/empathy-uoa-utils.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * empathy-utils.h - Header for UOA utilities - * Copyright (C) 2012 Collabora Ltd. - * @author Xavier Claessens <xavier.claessens@collabora.co.uk> - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __EMPATHY_UOA_UTILS_H__ -#define __EMPATHY_UOA_UTILS_H__ - -#include <libaccounts-glib/ag-manager.h> - -#define EMPATHY_UOA_SERVICE_TYPE "IM" - -G_BEGIN_DECLS - -void empathy_uoa_manager_set_default (AgManager *manager); -AgManager *empathy_uoa_manager_dup (void); - -G_END_DECLS - -#endif /* #ifndef __EMPATHY_UOA_UTILS_H__*/ |