remove libebook support

It's API just changed and it's not really useful anymore as gnome-about-me has
been removed.

https://bugzilla.gnome.org/show_bug.cgi?id=677533

diff --git a/configure.ac b/configure.ac
index 70d365708f66417a3852e895a2d86b657adf9d6b..3e8b313098bde27194004254d6ecfa6bd0f9906f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -218,18 +218,6 @@ PKG_CHECK_MODULES(EMPATHY_CALL,
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 

-# -----------------------------------------------------------
-# evolution-data-server (about-me)
-# -----------------------------------------------------------
-AC_ARG_WITH(eds,
-            AS_HELP_STRING([--with-eds],
-                           [build with evolution-data-server support]),,
-            [with_eds=yes])
-if test x"$with_eds" = x"yes" ; then
-   PKG_CHECK_MODULES(EDS, [libebook-1.2])
-   AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook])
-fi
-

 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------


@@ -550,5 +538,4 @@ Configure summary:
     Extras:
        Nautilus-sendto plugin......:  ${have_nst}
        GOA MC plugin...............:  ${have_goa}
     Extras:
        Nautilus-sendto plugin......:  ${have_nst}
        GOA MC plugin...............:  ${have_goa}

-       Salut E-D-S support.........:  ${with_eds}

 "
 "

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index abc48fed341d640f66c5c9329d3dde19f142e085..8fe8854e4cb443026dd0211b6abd233be367fb51 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS =                                           \
        $(GEOCODE_CFLAGS)                               \
        $(MEEGO_CFLAGS)                                 \
        $(CHEESE_CFLAGS)                                \
        $(GEOCODE_CFLAGS)                               \
        $(MEEGO_CFLAGS)                                 \
        $(CHEESE_CFLAGS)                                \

-       $(EDS_CFLAGS)                                   \

        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
 
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
 


@@ -184,7 +183,6 @@ libempathy_gtk_la_LIBADD =                  \
        $(GCR_LIBS)                             \
        $(MEEGO_LIBS)                           \
        $(CHEESE_LIBS)                          \
        $(GCR_LIBS)                             \
        $(MEEGO_LIBS)                           \
        $(CHEESE_LIBS)                          \

-       $(EDS_LIBS)                                     \

        $(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
        $(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index 1ac8fff599815a00e96d23580a8f4e1cf45067a5..f7b18863a4e2521cd1b938dfc80116439833ccee 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,10 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#if HAVE_EDS
-#include <libebook/e-book.h>
-#endif
-

 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-account-widget.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-account-widget.h>


@@ -58,72 +54,6 @@ empathy_local_xmpp_assistant_widget_init (EmpathyLocalXmppAssistantWidget *self)
       EmpathyLocalXmppAssistantWidgetPrivate);
 }
 
       EmpathyLocalXmppAssistantWidgetPrivate);
 }
 

-static 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", g_variant_new_string (nickname ? nickname : ""));
-  empathy_account_settings_set_ (settings,
-      "first-name", g_variant_new_string (first_name ? first_name : ""));
-  empathy_account_settings_set (settings,
-      "last-name", g_variant_new_string (last_name ? last_name : ""));
-  empathy_account_settings_set (settings, "email",
-      g_variant_new_string (email ? email : ""));
-  empathy_account_settings_set (settings, "jid",
-      g_variant_new_string (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;
-}
-

 static void
 handle_apply_cb (EmpathyAccountWidget *widget_object,
     gboolean is_valid,
 static void
 handle_apply_cb (EmpathyAccountWidget *widget_object,
     gboolean is_valid,


@@ -164,7 +94,8 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object)
 
   g_object_unref (pix);
 
 
   g_object_unref (pix);
 

-  self->priv->settings = create_salut_account_settings ();
+  self->priv->settings = empathy_account_settings_new ("salut", "local-xmpp",
+      NULL, _("People nearby"));

 
   account_widget = empathy_account_widget_new_for_protocol (
       self->priv->settings, TRUE);
 
   account_widget = empathy_account_widget_new_for_protocol (
       self->priv->settings, TRUE);

diff --git a/src/Makefile.am b/src/Makefile.am
index 086d13be8c1330d4e8e7c1351a364443c24ded7b..80b4d58c0c8f1260ca94d610cbf1309aacf8528b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =                                      \
        $(EMPATHY_CFLAGS)                               \
 
 CPPFLAGS_COMMON =                                      \
        $(EMPATHY_CFLAGS)                               \

-       $(EDS_CFLAGS)                                   \

        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)                                 \
        -DG_LOG_DOMAIN=\"empathy\"                      \
        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)                                 \
        -DG_LOG_DOMAIN=\"empathy\"                      \


@@ -39,7 +38,6 @@ libempathy_accounts_common_la_SOURCES =                                       \
 
 libempathy_accounts_common_la_LIBADD =                                 \
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la               \
 
 libempathy_accounts_common_la_LIBADD =                                 \
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la               \

-       $(EDS_LIBS)                                                     \

         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
        $(NULL)
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
        $(NULL)

diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 5cb89bb10cbce1d87b2230087a3038a993b35c6b..ba82180d5b8ddd41c6c15652faf2dc2ed3bfa292 100644 (file)
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -3,15 +3,13 @@ AM_CPPFLAGS =                                         \
        -I$(top_srcdir)                                 \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        $(EMPATHY_CFLAGS)                               \
        -I$(top_srcdir)                                 \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        $(EMPATHY_CFLAGS)                               \

-       $(EDS_CFLAGS)                                   \

        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
 
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
        $(WARN_CFLAGS)                                  \
        $(DISABLE_DEPRECATED)
 
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \

-       $(EMPATHY_LIBS)                                         \
-       $(EDS_LIBS)
+       $(EMPATHY_LIBS)

 
 noinst_PROGRAMS =                      \
        empathy-logs                    \
 
 noinst_PROGRAMS =                      \
        empathy-logs                    \