[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: Thu, 2 May 2019 17:36:59 +0000 (UTC)
commit 4a56e8fa215913b353c7ebb3c072c34b0c115b1c
Author: Corentin Noël <corentin elementary io>
Date: Tue Feb 12 17:31:42 2019 +0100
libsocialweb: Remove libsocialweb backend
it’s been dead for years
backends/libsocialweb/lib/folks-libsocialweb.deps | 4 -
backends/libsocialweb/lib/folks-libsocialweb.map | 6 -
backends/libsocialweb/lib/meson.build | 90 ----
backends/libsocialweb/lib/swf-persona-store.vala | 491 ----------------------
backends/libsocialweb/lib/swf-persona.vala | 421 -------------------
backends/libsocialweb/meson.build | 37 --
backends/libsocialweb/sw-backend-factory.vala | 46 --
backends/libsocialweb/sw-backend.vala | 298 -------------
backends/meson.build | 4 -
docs/meson.build | 9 -
docs/wiki/debugging.valadoc | 1 -
folks.doap | 7 +-
folks/build-conf.vapi | 3 -
meson.build | 7 -
meson_options.txt | 1 -
po/POTFILES.in | 1 -
po/POTFILES.skip | 1 -
tests/lib/libsocialweb/backend.vala | 421 -------------------
tests/lib/libsocialweb/meson.build | 15 -
tests/lib/libsocialweb/test-case.vala | 100 -----
tests/lib/meson.build | 4 -
tests/libsocialweb/aggregation.vala | 278 ------------
tests/libsocialweb/dummy-lsw.vala | 279 ------------
tests/libsocialweb/meson.build | 42 --
tests/meson.build | 4 -
25 files changed, 3 insertions(+), 2567 deletions(-)
---
diff --git a/backends/meson.build b/backends/meson.build
index 7e918d40..f975ed15 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -27,10 +27,6 @@ if telepathy_backend_enabled
subdir('telepathy')
endif
-if libsocialweb_backend_enabled
- subdir('libsocialweb')
-endif
-
if tracker_backend_enabled
subdir('tracker')
endif
diff --git a/docs/meson.build b/docs/meson.build
index 22a9b480..20252bcf 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -43,15 +43,6 @@ if eds_backend_enabled
}
endif
-if libsocialweb_backend_enabled
- valadoc_targets += {
- 'name': 'folks-libsocialweb',
- 'source_files': libsocialweb_backendlib_sources,
- 'library': libsocialweb_backendlib,
- 'dependencies': libsocialweb_backendlib_doc_deps,
- }
-endif
-
if telepathy_backend_enabled
valadoc_targets += {
'name': 'folks-telepathy',
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/meson.build b/meson.build
index 321fb750..1fd2e348 100644
--- a/meson.build
+++ b/meson.build
@@ -29,7 +29,6 @@ folks_lib_version = '25.19.1'
# binary-dependent on libfolks.so), but should also be incremented when
# incompatible changes are made in the backend library APIs themselves.
folks_eds_lib_version = '25.19.1'
-folks_libsocialweb_lib_version = '25.19.1'
folks_telepathy_lib_version = '25.19.1'
folks_tracker_lib_version = '25.19.1'
folks_dummy_lib_version = '25.19.1'
@@ -56,7 +55,6 @@ bluez_backend_enabled = get_option('bluez_backend')
docs_enabled = get_option('docs')
eds_backend_enabled = get_option('eds_backend')
installed_tests_enabled = get_option('installed_tests')
-libsocialweb_backend_enabled = get_option('libsocialweb_backend')
ofono_backend_enabled = get_option('ofono_backend')
telepathy_backend_enabled = get_option('telepathy_backend')
tracker_backend_enabled = get_option('tracker_backend')
@@ -131,10 +129,6 @@ if bluez_backend_enabled
python_dbusmock = py_installation.dependency('dbusmock')
endif
-if libsocialweb_backend_enabled
- libsocialweb_dep = dependency('libsocialweb-client', version: '>= 0.25.20')
-endif
-
if import_tool_enabled
libxml_dep = dependency('libxml-2.0')
endif
@@ -163,7 +157,6 @@ conf.set_quoted('INSTALLED_TESTS_META_DIR', folks_prefix / installed_tests_meta_
conf.set_quoted('BACKEND_DIR', folks_prefix / folks_backend_dir)
conf.set10('HAVE_BLUEZ', bluez_backend_enabled)
conf.set10('HAVE_EDS', eds_backend_enabled)
-conf.set10('HAVE_LIBSOCIALWEB', libsocialweb_backend_enabled)
conf.set10('HAVE_OFONO', ofono_backend_enabled)
conf.set10('HAVE_TELEPATHY', telepathy_backend_enabled)
conf.set10('HAVE_TRACKER', tracker_backend_enabled)
diff --git a/meson_options.txt b/meson_options.txt
index 8d16534b..042a72e8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,6 @@
# Backends
option('bluez_backend', type: 'boolean', value: true, description: 'build the Bluez backend')
option('eds_backend', type: 'boolean', value: true, description: 'build the E-D-S backend')
-option('libsocialweb_backend', type: 'boolean', value: false, description: 'build the libsocialweb backend')
option('ofono_backend', type: 'boolean', value: true, description: 'build the oFono backend')
option('telepathy_backend', type: 'boolean', value: true, description: 'build the Telepathy backend')
option('tracker_backend', type: 'boolean', value: false, description: 'build the Tracker backend')
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/po/POTFILES.skip b/po/POTFILES.skip
index cb7fa2a8..62769ac3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,7 +4,6 @@ backends/eds/lib/edsf-persona-store.c
backends/key-file/kf-backend-factory.c
backends/key-file/kf-persona-store.c
backends/key-file/kf-persona.c
-backends/libsocialweb/lib/swf-persona-store.c
backends/ofono/ofono-backend.c
backends/telepathy/lib/tpf-persona-store.c
backends/telepathy/lib/tpf-persona.c
diff --git a/tests/lib/meson.build b/tests/lib/meson.build
index dc112c51..0c3cafea 100644
--- a/tests/lib/meson.build
+++ b/tests/lib/meson.build
@@ -58,10 +58,6 @@ if telepathy_backend_enabled
subdir('telepathy')
endif
-if libsocialweb_backend_enabled
- subdir('libsocialweb')
-endif
-
if eds_backend_enabled
subdir('eds')
endif
diff --git a/tests/meson.build b/tests/meson.build
index 229007ac..6a7fa29c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -40,10 +40,6 @@ if telepathy_backend_enabled
subdir('folks')
endif
-if libsocialweb_backend_enabled
- subdir('libsocialweb')
-endif
-
if eds_backend_enabled
subdir('eds')
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]