diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/empathy-accounts-common.c | 1 | ||||
| -rw-r--r-- | src/empathy-accounts.c | 1 | ||||
| -rw-r--r-- | src/empathy-auto-salut-account-helper.c | 103 | ||||
| -rw-r--r-- | src/empathy-auto-salut-account-helper.h | 34 | ||||
| -rw-r--r-- | tests/interactive/Makefile.am | 11 |
6 files changed, 0 insertions, 152 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 06eaf1733..8623ac2dd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,9 +32,7 @@ noinst_LTLIBRARIES = libempathy-accounts-common.la libempathy_accounts_common_la_SOURCES = \ empathy-accounts-common.c empathy-accounts-common.h \ - empathy-account-assistant.c empathy-account-assistant.h \ empathy-accounts-dialog.c empathy-accounts-dialog.h \ - empathy-auto-salut-account-helper.c empathy-auto-salut-account-helper.h \ empathy-import-dialog.c empathy-import-dialog.h \ empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-import-widget.c empathy-import-widget.h \ diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 7da2788bc..f6bb40278 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -41,7 +41,6 @@ #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-auto-salut-account-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include <libempathy/empathy-debug.h> diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index a342f417d..6b51820f7 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -43,7 +43,6 @@ #include "empathy-accounts.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-auto-salut-account-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include <libempathy/empathy-debug.h> diff --git a/src/empathy-auto-salut-account-helper.c b/src/empathy-auto-salut-account-helper.c deleted file mode 100644 index d22fe51d4..000000000 --- a/src/empathy-auto-salut-account-helper.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2007-2010 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens <xclaesse@gmail.com> - * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - */ - -#include <config.h> - -#include <glib.h> -#include <glib/gi18n-lib.h> - -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/util.h> - -#if HAVE_EDS -#include <libebook/e-book.h> -#endif - -#include <libempathy/empathy-account-settings.h> - -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> - -#include "empathy-auto-salut-account-helper.h" - -EmpathyAccountSettings * -create_salut_account_settings (void) -{ - EmpathyAccountSettings *settings; -#if HAVE_EDS - EBook *book; - EContact *contact; - gchar *nickname = NULL; - gchar *first_name = NULL; - gchar *last_name = NULL; - gchar *email = NULL; - gchar *jid = NULL; - GError *error = NULL; -#endif - - settings = empathy_account_settings_new ("salut", "local-xmpp", NULL, - _("People nearby")); - -#if HAVE_EDS - /* Get self EContact from EDS */ - if (!e_book_get_self (&contact, &book, &error)) - { - DEBUG ("Failed to get self econtact: %s", error->message); - g_error_free (error); - return settings; - } - - nickname = e_contact_get (contact, E_CONTACT_NICKNAME); - first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME); - last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME); - email = e_contact_get (contact, E_CONTACT_EMAIL_1); - jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1); - - if (!tp_strdiff (nickname, "nickname")) - { - g_free (nickname); - nickname = NULL; - } - - DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n" - "last-name=%s\nemail=%s\njid=%s\n", - nickname, first_name, last_name, email, jid); - - empathy_account_settings_set_string (settings, - "nickname", nickname ? nickname : ""); - empathy_account_settings_set_string (settings, - "first-name", first_name ? first_name : ""); - empathy_account_settings_set_string (settings, - "last-name", last_name ? last_name : ""); - empathy_account_settings_set_string (settings, "email", email ? email : ""); - empathy_account_settings_set_string (settings, "jid", jid ? jid : ""); - - g_free (nickname); - g_free (first_name); - g_free (last_name); - g_free (email); - g_free (jid); - g_object_unref (contact); - g_object_unref (book); -#endif - - return settings; -} diff --git a/src/empathy-auto-salut-account-helper.h b/src/empathy-auto-salut-account-helper.h deleted file mode 100644 index ad186c840..000000000 --- a/src/empathy-auto-salut-account-helper.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007-2010 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Authors: Xavier Claessens <xclaesse@gmail.com> - * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - */ - -/* Helper functions to automatically create a Salut account */ - -#ifndef __AUTO_SALUT_ACCOUNT_HELPER_H__ -#define __AUTO_SALUT_ACCOUNT_HELPER_H__ - -#include <telepathy-glib/account-manager.h> - -#include <libempathy/empathy-connection-managers.h> -#include <libempathy/empathy-account-settings.h> - -EmpathyAccountSettings * create_salut_account_settings (void); - -#endif diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index e07ed65f7..bb0f41548 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -15,7 +15,6 @@ LDADD = \ noinst_PROGRAMS = \ empathy-logs \ - test-empathy-account-assistant \ test-empathy-contact-blocking-dialog \ test-empathy-presence-chooser \ test-empathy-status-preset-dialog \ @@ -27,14 +26,4 @@ test_empathy_contact_blocking_dialog_SOURCES = test-empathy-contact-blocking-dia test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c test_empathy_protocol_chooser_SOURCES = test-empathy-protocol-chooser.c -test_empathy_account_assistant_SOURCES = test-empathy-account-assistant.c test_empathy_account_chooser_SOURCES = test-empathy-account-chooser.c - -test_empathy_account_assistant_CFLAGS = -I$(top_srcdir)/src -test_empathy_account_assistant_LDADD = \ - $(top_builddir)/src/empathy-account-assistant.lo \ - $(top_builddir)/src/empathy-auto-salut-account-helper.lo \ - $(top_builddir)/src/empathy-import-pidgin.lo \ - $(top_builddir)/src/empathy-import-utils.lo \ - $(top_builddir)/src/empathy-import-widget.lo \ - $(LDADD) |