diff options
Diffstat (limited to 'libempathy')
-rw-r--r-- | libempathy/Makefile.am | 2 | ||||
-rw-r--r-- | libempathy/empathy-uoa-auth-handler.c | 7 | ||||
-rw-r--r-- | libempathy/empathy-uoa-utils.c | 49 | ||||
-rw-r--r-- | libempathy/empathy-uoa-utils.h | 35 |
4 files changed, 89 insertions, 4 deletions
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 2274b99ed..36de4d6c2 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -104,6 +104,8 @@ 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 d1b046512..9b1eade10 100644 --- a/libempathy/empathy-uoa-auth-handler.c +++ b/libempathy/empathy-uoa-auth-handler.c @@ -33,10 +33,9 @@ #include "empathy-debug.h" #include "empathy-utils.h" #include "empathy-uoa-auth-handler.h" +#include "empathy-uoa-utils.h" #include "empathy-sasl-mechanisms.h" -#define SERVICE_TYPE "IM" - struct _EmpathyUoaAuthHandlerPriv { AgManager *manager; @@ -50,7 +49,7 @@ empathy_uoa_auth_handler_init (EmpathyUoaAuthHandler *self) self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_UOA_AUTH_HANDLER, EmpathyUoaAuthHandlerPriv); - self->priv->manager = ag_manager_new_for_service_type (SERVICE_TYPE); + self->priv->manager = empathy_uoa_manager_dup (); } static void @@ -259,7 +258,7 @@ empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self, account = ag_manager_get_account (self->priv->manager, id); if (account != NULL) - l = ag_account_list_services_by_type (account, SERVICE_TYPE); + l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE); if (l == NULL) { DEBUG ("Couldn't find IM service for AgAccountId %u", id); diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c new file mode 100644 index 000000000..f63a15193 --- /dev/null +++ b/libempathy/empathy-uoa-utils.c @@ -0,0 +1,49 @@ +/* + * 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" + +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include "empathy-debug.h" +#include "empathy-uoa-utils.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 new file mode 100644 index 000000000..2cd7a41a2 --- /dev/null +++ b/libempathy/empathy-uoa-utils.h @@ -0,0 +1,35 @@ +/* + * 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__*/ |