From c689cd6a91cb2a31ce0d03f47e59ca4e3f368e9c Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Fri, 26 Jul 2013 10:44:30 +0100 Subject: uoa-utils: move from Empathy to tp-aw https://bugzilla.gnome.org/show_bug.cgi?id=699492 --- libempathy/Makefile.am | 2 -- libempathy/empathy-uoa-auth-handler.c | 2 +- libempathy/empathy-uoa-utils.c | 49 ----------------------------------- libempathy/empathy-uoa-utils.h | 35 ------------------------- tp-account-widgets/Makefile.am | 16 +++++++++++- tp-account-widgets/tpaw-keyring.c | 6 ++--- tp-account-widgets/tpaw-uoa-utils.c | 49 +++++++++++++++++++++++++++++++++++ tp-account-widgets/tpaw-uoa-utils.h | 35 +++++++++++++++++++++++++ 8 files changed, 103 insertions(+), 91 deletions(-) delete mode 100644 libempathy/empathy-uoa-utils.c delete mode 100644 libempathy/empathy-uoa-utils.h create mode 100644 tp-account-widgets/tpaw-uoa-utils.c create mode 100644 tp-account-widgets/tpaw-uoa-utils.h 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 #include +#include #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 - * - * 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 - * - * 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 - -#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__*/ diff --git a/tp-account-widgets/Makefile.am b/tp-account-widgets/Makefile.am index dbfffeeb5..80089458f 100644 --- a/tp-account-widgets/Makefile.am +++ b/tp-account-widgets/Makefile.am @@ -63,6 +63,19 @@ libtp_account_widgets_la_SOURCES = \ $(libtp_account_widgets_headers) \ $(NULL) +# these are sources that depend on Ubuntu Online Accounts +uoa_sources = \ + tpaw-uoa-utils.c \ + tpaw-uoa-utils.h \ + $(NULL) + +if HAVE_UOA +libtp_account_widgets_la_SOURCES += $(uoa_sources) +EXTRA_DIST = +else +EXTRA_DIST = $(uoa_sources) +endif + # do not distribute generated files nodist_libtp_account_widgets_la_SOURCES = \ $(BUILT_SOURCES) @@ -70,6 +83,7 @@ nodist_libtp_account_widgets_la_SOURCES = \ check_c_sources = \ $(libtp_account_widgets_sources) \ $(libtp_account_widgets_headers) \ + $(uoa_sources) \ $(NULL) include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style @@ -103,7 +117,7 @@ tpaw-account-widgets-resources.c: tpaw-account-widgets.gresource.xml $(account_w tpaw-account-widgets-resources.h: tpaw-account-widgets.gresource.xml $(account_widgets_resource_files) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< -EXTRA_DIST = \ +EXTRA_DIST += \ tpaw-account-widgets.gresource.xml \ $(account_widgets_dtd_files) \ $(account_widgets_ui_files) \ diff --git a/tp-account-widgets/tpaw-keyring.c b/tp-account-widgets/tpaw-keyring.c index 827f2ca6c..94bbd93e0 100644 --- a/tp-account-widgets/tpaw-keyring.c +++ b/tp-account-widgets/tpaw-keyring.c @@ -29,7 +29,7 @@ #include #include #include -#include "empathy-uoa-utils.h" +#include "tpaw-uoa-utils.h" #endif #include "empathy-utils.h" @@ -114,11 +114,11 @@ uoa_password_common (TpAccount *tp_account, goto error; } - manager = empathy_uoa_manager_dup (); + manager = tpaw_uoa_manager_dup (); account = ag_manager_get_account (manager, account_id); /* Assuming there is only one IM service */ - l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE); + l = ag_account_list_services_by_type (account, TPAW_UOA_SERVICE_TYPE); if (l == NULL) { g_simple_async_result_set_error (result, diff --git a/tp-account-widgets/tpaw-uoa-utils.c b/tp-account-widgets/tpaw-uoa-utils.c new file mode 100644 index 000000000..6eb43fe1f --- /dev/null +++ b/tp-account-widgets/tpaw-uoa-utils.c @@ -0,0 +1,49 @@ +/* + * tpaw-uoa-utils.c - Source for UOA utilities + * Copyright (C) 2012 Collabora Ltd. + * @author Xavier Claessens + * + * 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 "tpaw-uoa-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include "empathy-debug.h" + +static AgManager *singleton = NULL; + +void +tpaw_uoa_manager_set_default (AgManager *manager) +{ + if (singleton != NULL) + return; + + singleton = manager; + g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton); +} + +AgManager * +tpaw_uoa_manager_dup (void) +{ + if (singleton != NULL) + return g_object_ref (singleton); + + singleton = ag_manager_new_for_service_type (TPAW_UOA_SERVICE_TYPE); + g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton); + + return singleton; +} diff --git a/tp-account-widgets/tpaw-uoa-utils.h b/tp-account-widgets/tpaw-uoa-utils.h new file mode 100644 index 000000000..3529e1ae2 --- /dev/null +++ b/tp-account-widgets/tpaw-uoa-utils.h @@ -0,0 +1,35 @@ +/* + * tpaw-utils.h - Header for UOA utilities + * Copyright (C) 2012 Collabora Ltd. + * @author Xavier Claessens + * + * 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 __TPAW_UOA_UTILS_H__ +#define __TPAW_UOA_UTILS_H__ + +#include + +#define TPAW_UOA_SERVICE_TYPE "IM" + +G_BEGIN_DECLS + +void tpaw_uoa_manager_set_default (AgManager *manager); +AgManager *tpaw_uoa_manager_dup (void); + +G_END_DECLS + +#endif /* #ifndef __TPAW_UOA_UTILS_H__*/ -- cgit v1.2.3