[folks/wip/tintou/libsocialweb-removal] libsocialweb: Remove libsocialweb backend
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks/wip/tintou/libsocialweb-removal] libsocialweb: Remove libsocialweb backend
- Date: Tue, 12 Feb 2019 16:33:10 +0000 (UTC)
commit a0a26fb7b26d3e153b06a22b718e7702a7b5dcfa
Author: Corentin Noël <corentin elementary io>
Date: Tue Feb 12 17:31:42 2019 +0100
libsocialweb: Remove libsocialweb backend
It is an unmaintained library
Makefile.am | 1 -
backends/Makefile.am | 5 -
backends/eds/eds-backend.vala | 2 +-
backends/eds/lib/edsf-persona-store.vala | 2 +-
backends/libsocialweb/Makefile.am | 44 --
backends/libsocialweb/lib/Makefile.am | 46 --
.../lib/folks-libsocialweb-uninstalled.pc.in | 12 -
backends/libsocialweb/lib/folks-libsocialweb.deps | 4 -
backends/libsocialweb/lib/folks-libsocialweb.pc.in | 15 -
backends/libsocialweb/lib/swf-persona-store.vala | 491 ---------------------
backends/libsocialweb/lib/swf-persona.vala | 421 ------------------
backends/libsocialweb/sw-backend-factory.vala | 46 --
backends/libsocialweb/sw-backend.vala | 298 -------------
configure.ac | 55 ---
docs/Makefile.am | 69 ---
docs/wiki/debugging.valadoc | 1 -
folks.doap | 7 +-
folks/build-conf.vapi | 3 -
po/POTFILES.in | 1 -
tests/Makefile.am | 5 -
tests/bluez/device-properties.vala | 12 +-
tests/lib/Makefile.am | 5 -
tests/lib/bluez/backend.vala | 14 +-
tests/lib/eds/backend.vala | 2 +-
tests/lib/libsocialweb/Makefile.am | 61 ---
tests/lib/libsocialweb/backend.vala | 420 ------------------
tests/lib/libsocialweb/test-case.vala | 100 -----
tests/lib/test-case.vala | 3 -
tests/libsocialweb/Makefile.am | 50 ---
tests/libsocialweb/aggregation.vala | 278 ------------
tests/libsocialweb/dummy-lsw.vala | 275 ------------
31 files changed, 19 insertions(+), 2729 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 907367d3..f5dd9cf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-tests \
--enable-eds-backend \
--enable-telepathy-backend \
- --enable-libsocialweb-backend \
--enable-tracker-backend \
--enable-zeitgeist \
--disable-vala \
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 774f02ce..83e61853 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -7,10 +7,6 @@ if ENABLE_TELEPATHY
SUBDIRS += telepathy
endif
-if ENABLE_LIBSOCIALWEB
-SUBDIRS += libsocialweb
-endif
-
if ENABLE_TRACKER
SUBDIRS += tracker
endif
@@ -31,7 +27,6 @@ DIST_SUBDIRS = \
bluez \
eds \
key-file \
- libsocialweb \
ofono \
telepathy \
tracker \
diff --git a/backends/eds/eds-backend.vala b/backends/eds/eds-backend.vala
index fe297be5..4f0d2e05 100644
--- a/backends/eds/eds-backend.vala
+++ b/backends/eds/eds-backend.vala
@@ -30,7 +30,7 @@ extern const string BACKEND_NAME;
/* The following function is needed in order to use the async SourceRegistry
* constructor. FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=659886 */
-[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h",
finish_function = "e_source_registry_new_finish")]
+[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h", finish_name =
"e_source_registry_new_finish")]
internal extern static async E.SourceRegistry create_source_registry (GLib.Cancellable? cancellable = null)
throws GLib.Error;
/**
diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index 320a05d5..33a10f2b 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -31,7 +31,7 @@ extern const string BACKEND_NAME;
/* The following function is needed in order to use the async SourceRegistry
* constructor. FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=659886 */
-[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h",
finish_function = "e_source_registry_new_finish")]
+[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h", finish_name =
"e_source_registry_new_finish")]
internal extern static async E.SourceRegistry create_source_registry (GLib.Cancellable? cancellable = null)
throws GLib.Error;
/**
diff --git a/configure.ac b/configure.ac
index f091fbe0..44963031 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,10 +37,6 @@ m4_define([folks_eds_lt_current], [43])
m4_define([folks_eds_lt_revision], [4])
m4_define([folks_eds_lt_age], [18])
-m4_define([folks_libsocialweb_lt_current], [43])
-m4_define([folks_libsocialweb_lt_revision], [4])
-m4_define([folks_libsocialweb_lt_age], [18])
-
m4_define([folks_telepathy_lt_current], [43])
m4_define([folks_telepathy_lt_revision], [4])
m4_define([folks_telepathy_lt_age], [18])
@@ -106,9 +102,6 @@ AC_SUBST([LT_AGE])
FOLKS_EDS_LT_VERSION=folks_eds_lt_current:folks_eds_lt_revision:folks_eds_lt_age
AC_SUBST([FOLKS_EDS_LT_VERSION])
-FOLKS_LIBSOCIALWEB_LT_VERSION=folks_libsocialweb_lt_current:folks_libsocialweb_lt_revision:folks_libsocialweb_lt_age
-AC_SUBST([FOLKS_LIBSOCIALWEB_LT_VERSION])
-
FOLKS_TELEPATHY_LT_VERSION=folks_telepathy_lt_current:folks_telepathy_lt_revision:folks_telepathy_lt_age
AC_SUBST([FOLKS_TELEPATHY_LT_VERSION])
@@ -130,7 +123,6 @@ AC_SUBST([API_VERSION_DOT])
# Backend library API versions
AC_SUBST([FOLKS_EDS_API_VERSION], [0.6])
-AC_SUBST([FOLKS_LIBSOCIALWEB_API_VERSION], [0.6])
AC_SUBST([FOLKS_TELEPATHY_API_VERSION], [0.6])
AC_SUBST([FOLKS_TRACKER_API_VERSION], [0.6])
AC_SUBST([FOLKS_DUMMY_API_VERSION], [0.6])
@@ -214,46 +206,6 @@ AC_ARG_ENABLE(zeitgeist,
enable_zeitgeist=$enableval,
enable_zeitgeist=auto)
-# Automatically check the dependencies for the libsocialweb backend
-SW_CLIENT_REQUIRED=0.25.20
-AC_ARG_ENABLE(libsocialweb-backend,
- AS_HELP_STRING([--enable-libsocialweb-backend=@<:@no/yes/auto@:>@],
- [build the Libsocialweb backend (default: auto)]),
- enable_libsocialweb_backend=$enableval,
- enable_libsocialweb_backend=auto )
-
-# this may be overwritten farther down
-AC_DEFINE(HAVE_LIBSOCIALWEB, [0],
- [Define as 1 if you have the libsocialweb backend])
-AS_IF([test "x$enable_libsocialweb_backend" != "xno"], [
- PKG_CHECK_MODULES([SW_CLIENT], [libsocialweb-client >= $SW_CLIENT_REQUIRED],
- have_libsocialweb_backend="yes", have_libsocialweb_backend="no")
- AS_IF([test "x$have_libsocialweb_backend" = "xyes" -a \
- "x$enable_vala" = "xyes"], [
- VALA_CHECK_PACKAGES([telepathy-glib
- gio-2.0
- gee-0.8
- libsocialweb-client],
- ,
- have_libsocialweb_backend="no")
- ])
-
- AS_IF([test "x$have_libsocialweb_backend" = "xyes"], [
- AC_DEFINE(HAVE_LIBSOCIALWEB, [1],
- [Define if you have the libsocialweb backend])
- ])
-], [
- have_libsocialweb_backend=no
-])
-
-AS_IF([test "x$enable_libsocialweb_backend" = "xyes" -a \
- "x$have_libsocialweb_backend" != "xyes"], [
- AC_MSG_ERROR([Cannot find libsocialweb dependencies.])
-])
-
-AM_CONDITIONAL([ENABLE_LIBSOCIALWEB],
- [test "x$have_libsocialweb_backend" = "xyes"])
-
# -----------------------------------------------------------
# Dependencies
# -----------------------------------------------------------
@@ -790,10 +742,6 @@ AC_CONFIG_FILES([
backends/dummy/Makefile
backends/dummy/lib/Makefile
backends/key-file/Makefile
- backends/libsocialweb/Makefile
- backends/libsocialweb/lib/Makefile
- backends/libsocialweb/lib/folks-libsocialweb.pc
- backends/libsocialweb/lib/folks-libsocialweb-uninstalled.pc
backends/telepathy/Makefile
backends/telepathy/lib/Makefile
backends/tracker/Makefile
@@ -812,7 +760,6 @@ AC_CONFIG_FILES([
tests/folks/Makefile
tests/dummy/Makefile
tests/key-file/Makefile
- tests/libsocialweb/Makefile
tests/telepathy/Makefile
tests/tracker/Makefile
tests/lib/Makefile
@@ -821,7 +768,6 @@ AC_CONFIG_FILES([
tests/lib/eds/Makefile
tests/lib/dummy/Makefile
tests/lib/key-file/Makefile
- tests/lib/libsocialweb/Makefile
tests/lib/telepathy/Makefile
tests/lib/tracker/Makefile
tests/lib/telepathy/contactlist/Makefile
@@ -846,7 +792,6 @@ Configure summary:
Inspector tool..............: ${with_inspect_tool}
Telepathy backend...........: ${enable_telepathy_backend}
Tracker backend.............: ${enable_tracker_backend}
- Libsocialweb backend........: ${have_libsocialweb_backend}
E-D-S backend...............: ${enable_eds_backend}
Ofono backend...............: ${enable_ofono_backend}
BlueZ backend...............: ${enable_bluez_backend}
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f9328365..6d532ee6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -307,75 +307,6 @@ upload_docs += upload-docs-c-folks-eds upload-docs-vala-folks-eds
endif # ENABLE_EDS
-#####################
-# libsocialweb docs #
-#####################
-if ENABLE_LIBSOCIALWEB
-folkslibsocialwebdocdir=$(datadir)/devhelp/references/folks-libsocialweb
-folkslibsocialwebgtkdocdir=$(datadir)/gtk-doc/html/folks-libsocialweb
-
-folkslibsocialwebdoc_DATA = \
- folks-libsocialweb/folks-libsocialweb/folks-libsocialweb.devhelp2 \
- $(addprefix folks-libsocialweb/folks-libsocialweb/,$(common_doc_files))\
- $(NULL)
-
-folkslibsocialwebgtkdoc_DATA = gtk-doc/folks-libsocialweb/html/*
-
-$(folkslibsocialwebdoc_DATA): \
- folks-libsocialweb-doc.stamp \
- $(NULL)
-$(folkslibsocialwebgtkdoc_DATA): folks-libsocialweb-gtk-doc.stamp
-
-folks_libsocialweb_doc_files = $(top_srcdir)/backends/libsocialweb/lib/*.vala
-folks_libsocialweb_doc_deps = \
- gmodule-2.0 \
- gio-2.0 \
- gee-0.8 \
- libsocialweb-client \
- build-conf \
- folks \
- folks-internal \
- folks-generics \
- $(NULL)
-valadoc_flags_folks_libsocialweb = \
- $(valadoc_flags) \
- -X $(top_srcdir)/backends/libsocialweb/lib/folks/folks-libsocialweb.h \
- $(addprefix --pkg=,$(folks_libsocialweb_doc_deps)) \
- --vapidir=$(top_srcdir)/folks \
- --vapidir=$(top_srcdir)/backends/libsocialweb/lib \
- $(folks_libsocialweb_doc_files) \
- $(NULL)
-
-folks-libsocialweb-doc.stamp: $(folks_libsocialweb_doc_files)
- $(AM_V_GEN)$(VALADOC) \
- -o folks-libsocialweb/ \
- --doclet=devhelp \
- $(valadoc_flags_folks_libsocialweb) \
- $(NULL)
- @touch $@
-
-folks-libsocialweb-gtk-doc.stamp: $(folks_libsocialweb_doc_files)
- $(AM_V_GEN)$(VALADOC) \
- -X -l -X $(top_builddir)/folks/.libs/libfolks.so \
- -X -l -X $(top_builddir)/backends/libsocialweb/lib/.libs/libfolks-libsocialweb.so \
- -o gtk-doc/folks-libsocialweb \
- --doclet=gtkdoc \
- $(valadoc_flags_folks_libsocialweb) \
- $(NULL)
- @touch $@
-
-distclean_dirs += folks-libsocialweb
-docs += \
- folks-libsocialweb-doc \
- folks-libsocialweb-gtk-doc \
- $(NULL)
-upload_docs += \
- upload-docs-c-folks-libsocialweb \
- upload-docs-vala-folks-libsocialweb \
- $(NULL)
-
-endif # ENABLE_LIBSOCIALWEB
-
#####################
# end optional docs #
#####################
diff --git a/docs/wiki/debugging.valadoc b/docs/wiki/debugging.valadoc
index c7cf5f0d..c7bd6b9b 100644
--- a/docs/wiki/debugging.valadoc
+++ b/docs/wiki/debugging.valadoc
@@ -9,7 +9,6 @@ Available values for folks for the ''G_MESSAGES_DEBUG'' environment variable are
* ''folks'' (for the core of libfolks)
* ''eds'' (for the evolution-data-server backend)
* ''key-file'' (for the key file backend)
- * ''libsocialweb'' (for the libsocialweb backend)
* ''telepathy'' (for the Telepathy backend)
* ''tracker'' (for the Tracker backend)
diff --git a/folks.doap b/folks.doap
index 6595d513..0d9a0d9d 100644
--- a/folks.doap
+++ b/folks.doap
@@ -9,10 +9,9 @@
<shortdesc xml:lang="en">People aggregation library</shortdesc>
<category rdf:resource="http://api.gnome.org/doap-extensions#core"; />
<description>Folks is a contact aggregation library. It retrieves contacts
- from various sources (including Telepathy IM accounts, libsocialweb web
- service contacts, and local contact stores) and compiles them into
- fully-fledged people objects. The ultimate goal is to provide the platform
- with easy access to all of the user's contacts.</description>
+ from various sources (including Telepathy IM accounts, and local contact stores)
+ and compiles them into fully-fledged people objects. The ultimate goal isto provide
+ the platform with easy access to all of the user's contacts.</description>
<homepage rdf:resource="https://wiki.gnome.org/Projects/Folks"; />
<download-page rdf:resource="https://download.gnome.org/sources/folks/"; />
<bug-database
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index a3ee20d4..a97593fc 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -48,9 +48,6 @@ public class Folks.BuildConf
[CCode (cname = "HAVE_EDS")]
public static bool HAVE_EDS;
- [CCode (cname = "HAVE_LIBSOCIALWEB")]
- public static bool HAVE_LIBSOCIALWEB;
-
[CCode (cname = "HAVE_OFONO")]
public static bool HAVE_OFONO;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7cac02c4..eb3537f0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ backends/eds/lib/edsf-persona-store.vala
backends/key-file/kf-backend-factory.vala
backends/key-file/kf-persona-store.vala
backends/key-file/kf-persona.vala
-backends/libsocialweb/lib/swf-persona-store.vala
backends/ofono/ofono-backend.vala
backends/telepathy/lib/tp-lowlevel.c
backends/telepathy/lib/tpf-persona-store.vala
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 38561942..7684a6c0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,10 +18,6 @@ if ENABLE_TELEPATHY
SUBDIRS += folks telepathy
endif
-if ENABLE_LIBSOCIALWEB
-SUBDIRS += libsocialweb
-endif
-
if ENABLE_EDS
SUBDIRS += eds
endif
@@ -42,7 +38,6 @@ DIST_SUBDIRS = \
key-file \
bluez \
telepathy \
- libsocialweb \
tracker \
$(NULL)
diff --git a/tests/bluez/device-properties.vala b/tests/bluez/device-properties.vala
index 19d806a5..3bd56274 100644
--- a/tests/bluez/device-properties.vala
+++ b/tests/bluez/device-properties.vala
@@ -46,7 +46,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
this.bluez_backend.mock_bluez.add_device ("hci0",
this.bluez_backend.primary_device_address, "My Phone");
}
- catch (IOError e1)
+ catch (GLib.Error e1)
{
error ("Error setting up mock BlueZ device: %s", e1.message);
}
@@ -103,7 +103,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
this.bluez_backend.mock_bluez.pair_device ("hci0",
this.bluez_backend.primary_device_address);
}
- catch (IOError e4)
+ catch (GLib.Error e4)
{
error ("Error pairing mock BlueZ device: %s", e4.message);
}
@@ -132,7 +132,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
this.bluez_backend.mock_bluez.block_device ("hci0",
this.bluez_backend.primary_device_address);
}
- catch (IOError e1)
+ catch (GLib.Error e1)
{
error ("Error blocking device: %s", e1.message);
}
@@ -180,7 +180,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
this.bluez_backend.mock_bluez.pair_device ("hci0",
this.bluez_backend.primary_device_address);
}
- catch (IOError e4)
+ catch (GLib.Error e4)
{
error ("Error blocking device: %s", e4.message);
}
@@ -201,7 +201,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
this.bluez_backend.mock_bluez.block_device ("hci0",
this.bluez_backend.primary_device_address);
}
- catch (IOError e5)
+ catch (GLib.Error e5)
{
error ("Error blocking device again: %s", e5.message);
}
@@ -275,7 +275,7 @@ public class DevicePropertiesTests : BluezTest.TestCase
new Variant.array (VariantType.STRING, {})
});
}
- catch (IOError e1)
+ catch (GLib.Error e1)
{
error ("Error setting device alias: %s", e1.message);
}
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 988f0439..429abe33 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -21,10 +21,6 @@ SUBDIRS += \
$(NULL)
endif
-if ENABLE_LIBSOCIALWEB
-SUBDIRS += libsocialweb
-endif
-
if ENABLE_TRACKER
SUBDIRS += tracker
endif
@@ -39,7 +35,6 @@ DIST_SUBDIRS = \
bluez \
telepathy \
eds \
- libsocialweb \
tracker \
$(NULL)
diff --git a/tests/lib/bluez/backend.vala b/tests/lib/bluez/backend.vala
index 978fe555..023117e6 100644
--- a/tests/lib/bluez/backend.vala
+++ b/tests/lib/bluez/backend.vala
@@ -31,19 +31,19 @@ namespace org
{
[DBus (name = "AddAdapter")]
public abstract string add_adapter (string device_name,
- string system_name) throws IOError;
+ string system_name) throws GLib.Error;
[DBus (name = "AddDevice")]
public abstract string add_device (string adapter_device_name,
- string device_address, string alias) throws IOError;
+ string device_address, string alias) throws GLib.Error;
[DBus (name = "PairDevice")]
public abstract void pair_device (string adapter_device_name,
- string device_address) throws IOError;
+ string device_address) throws GLib.Error;
[DBus (name = "BlockDevice")]
public abstract void block_device (string adapter_device_name,
- string device_address) throws IOError;
+ string device_address) throws GLib.Error;
}
namespace obex
@@ -65,7 +65,7 @@ namespace org
{
[DBus (name = "UpdateStatus")]
public abstract void update_status (bool is_complete)
- throws IOError;
+ throws GLib.Error;
}
}
}
@@ -201,7 +201,7 @@ public class BluezTest.Backend
this._mock_obex_base.reset ();
this._mock_bluez_base.reset ();
}
- catch (IOError e1)
+ catch (GLib.Error e1)
{
error ("Error resetting python-dbusmock state: %s", e1.message);
}
@@ -252,7 +252,7 @@ public class BluezTest.Backend
/* Set the vCard to be returned for all transfers. */
return this.set_simple_device_vcard (vcard);
}
- catch (IOError e1)
+ catch (GLib.Error e1)
{
error ("Error setting up mock BlueZ device: %s", e1.message);
}
diff --git a/tests/lib/eds/backend.vala b/tests/lib/eds/backend.vala
index b907f206..22923ed5 100644
--- a/tests/lib/eds/backend.vala
+++ b/tests/lib/eds/backend.vala
@@ -24,7 +24,7 @@ using Random;
/* The following function is needed in order to use the async SourceRegistry
* constructor. FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=659886 */
-[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h",
finish_function = "e_source_registry_new_finish")]
+[CCode (cname = "e_source_registry_new", cheader_filename = "libedataserver/libedataserver.h", finish_name =
"e_source_registry_new_finish")]
internal extern static async E.SourceRegistry create_source_registry (GLib.Cancellable? cancellable = null)
throws GLib.Error;
errordomain EdsTest.BackendSetupError
diff --git a/tests/lib/test-case.vala b/tests/lib/test-case.vala
index cfed5219..a86ea9e2 100644
--- a/tests/lib/test-case.vala
+++ b/tests/lib/test-case.vala
@@ -75,9 +75,6 @@ public abstract class Folks.TestCase : Object
if (Folks.BuildConf.HAVE_EDS)
locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/eds/.libs/eds.so";
- if (Folks.BuildConf.HAVE_LIBSOCIALWEB)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/libsocialweb/.libs/libsocialweb.so";
-
if (Folks.BuildConf.HAVE_OFONO)
locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/ofono/.libs/ofono.so";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
