GNOME.org
 

[gnome-online-accounts/wip/hadess/remove-pocket] Remove Pocket and deprecate org.gnome.OnlineAccounts.ReadLater

commit 55481e550fdc4c202009b57dc099ecc07e5780f8
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 24 10:12:02 2019 +0100

    Remove Pocket and deprecate org.gnome.OnlineAccounts.ReadLater
    
    The non-standard OAuth is causing maintenance problem and the maintainer
    has already disabled Pocket in certain distributions, as there aren't
    any core GNOME applications using it as part of the core experience.
    
    Remove the code so that applications don't try and use this
    implementation with no future.

 README                                  |  11 -
 configure.ac                            |  19 --
 data/dbus-interfaces.xml                |   4 +
 data/icons/16x16/Makefile.am            |   1 -
 data/icons/16x16/goa-account-pocket.png | Bin 662 -> 0 bytes
 data/icons/22x22/Makefile.am            |   1 -
 data/icons/22x22/goa-account-pocket.png | Bin 863 -> 0 bytes
 data/icons/24x24/Makefile.am            |   1 -
 data/icons/24x24/goa-account-pocket.png | Bin 894 -> 0 bytes
 data/icons/32x32/Makefile.am            |   1 -
 data/icons/32x32/goa-account-pocket.png | Bin 1228 -> 0 bytes
 data/icons/48x48/Makefile.am            |   1 -
 data/icons/48x48/goa-account-pocket.png | Bin 1518 -> 0 bytes
 data/icons/96x96/Makefile.am            |   1 -
 data/icons/96x96/goa-account-pocket.png | Bin 3584 -> 0 bytes
 data/icons/meson.build                  |   1 -
 gnome-online-accounts.doap              |   2 +-
 meson.build                             |  13 -
 meson_options.txt                       |   3 -
 po/POTFILES.in                          |   1 -
 src/examples/Makefile.am                |   7 +-
 src/examples/add-pocket.c               | 103 --------
 src/examples/meson.build                |   1 -
 src/goabackend/Makefile.am              |   1 -
 src/goabackend/goabackendenums.h        |   2 +-
 src/goabackend/goaobjectskeletonutils.c |  23 --
 src/goabackend/goaobjectskeletonutils.h |   3 -
 src/goabackend/goapocketprovider.c      | 445 --------------------------------
 src/goabackend/goapocketprovider.h      |  40 ---
 src/goabackend/goaprovider.c            |   4 -
 src/goabackend/meson.build              |   1 -
 31 files changed, 7 insertions(+), 683 deletions(-)
---
diff --git a/README b/README
index b4e3a2aa..4f4621eb 100644
--- a/README
+++ b/README
@@ -60,17 +60,6 @@ We are allowed to embed the client_secret in the source code. See
 https://developers.google.com/accounts/docs/OAuth2InstalledApp#overview
 
 
-Pocket
-------
-
-OAuth 2.0 variant:
-https://getpocket.com/developer/docs/authentication
-
-Authenticating with a Firefox Account is not documented. These slides are
-useful:
-http://www.slideshare.net/KuoE0/pocket-authentication-with-oauth-on-firefox-os
-
-
 Windows Live
 ------------
 
diff --git a/configure.ac b/configure.ac
index b7a9dcd9..75b66ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,24 +303,6 @@ if test "$enable_windows_live" != "no"; then
   AC_DEFINE(GOA_WINDOWS_LIVE_ENABLED, 1, [Enable Windows Live data provider])
 fi
 
-# Pocket
-AC_DEFINE(GOA_POCKET_NAME, ["pocket"], [ProviderType and extension point name])
-AC_ARG_ENABLE([pocket],
-              [AS_HELP_STRING([--enable-pocket], [Enable Pocket provider])],
-              [],
-              [enable_pocket=yes])
-AC_ARG_WITH(pocket-client-id,
-            [AS_HELP_STRING([--with-pocket-client-id], [Pocket OAuth 2.0 client id])],
-            [],
-            [])
-if test "$with_pocket_client_id" = ""; then
-  with_pocket_client_id="16630-40b25246b56e8ad5310b2883"
-fi
-AC_DEFINE_UNQUOTED(GOA_POCKET_CLIENT_ID, ["$with_pocket_client_id"], [Pocket OAuth 2.0 client id])
-if test "$enable_pocket" != "no"; then
-  AC_DEFINE(GOA_POCKET_ENABLED, 1, [Enable Pocket data provider])
-fi
-
 # Kerberos
 AC_DEFINE(GOA_KERBEROS_NAME, ["kerberos"], [ProviderType and extension point name])
 AC_ARG_ENABLE([kerberos],
@@ -549,7 +531,6 @@ echo "
        Kerberos provider:              ${enable_kerberos}
        Facebook provider:              ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id})
        Windows Live provider:          ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id})
-        Pocket provider:                ${enable_pocket} (id:${with_pocket_client_id})
        Last.fm provider:               ${enable_lastfm} (id:${with_lastfm_client_id} 
secret:${with_lastfm_client_secret})
 
        Maintainer mode:                ${USE_MAINTAINER_MODE}
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 47a72c9a..2fa79824 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -813,8 +813,12 @@
 
       An account object implements this interface if it provides
       read-later-like capabilities.
+
+      The #org.gnome.OnlineAccounts.Todo interface is not used by
+      any account.
   -->
   <interface name="org.gnome.OnlineAccounts.ReadLater">
+    <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
   </interface>
 
   <!--
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 26c54c88..2c1e6450 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -8,7 +8,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-foursquare.png      \
        $(NULL)
 
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index a4b1fc6a..6f9e18ad 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -8,7 +8,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-foursquare.png      \
        $(NULL)
 
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 721e1f80..d8e724e2 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -7,7 +7,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-foursquare.png      \
        goa-account-flickr.png          \
        $(NULL)
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index a13313de..7784e33f 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -8,7 +8,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-foursquare.png      \
        $(NULL)
 
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index e86a6e47..9df7ea31 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -7,7 +7,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-flickr.png          \
        goa-account-foursquare.png      \
        $(NULL)
diff --git a/data/icons/96x96/Makefile.am b/data/icons/96x96/Makefile.am
index 0cfa9ddb..15f5cc2b 100644
--- a/data/icons/96x96/Makefile.am
+++ b/data/icons/96x96/Makefile.am
@@ -7,7 +7,6 @@ icon_DATA =                             \
        goa-account-google.png          \
        goa-account-msn.png             \
        goa-account-owncloud.png        \
-       goa-account-pocket.png          \
        goa-account-flickr.png          \
        goa-account-foursquare.png      \
        $(NULL)
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 79deee22..07e7f682 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -6,7 +6,6 @@ icon_data = [
   'goa-account-msn.png',
   'goa-account-owncloud.png',
   'goa-account.png',
-  'goa-account-pocket.png',
 ]
 
 icon_data_256 = ['goa-account.png']
diff --git a/gnome-online-accounts.doap b/gnome-online-accounts.doap
index 59047426..0561cd90 100644
--- a/gnome-online-accounts.doap
+++ b/gnome-online-accounts.doap
@@ -12,7 +12,7 @@
   <description xml:lang="en">
 GNOME Online Accounts provides interfaces so that applications and
 libraries in GNOME can access the user's online accounts. It has
-providers for Google, Nextcloud, Facebook, Microsoft, Flickr, Pocket,
+providers for Google, Nextcloud, Facebook, Microsoft, Flickr,
 Foursquare, Microsoft Exchange, Last.fm, IMAP/SMTP and Kerberos.
   </description>
 
diff --git a/meson.build b/meson.build
index bdfb5998..9f96c94e 100644
--- a/meson.build
+++ b/meson.build
@@ -207,15 +207,6 @@ config_h.set_quoted('GOA_OWNCLOUD_NAME', 'owncloud')
 enable_owncloud = get_option('owncloud')
 config_h.set('GOA_OWNCLOUD_ENABLED', enable_owncloud)
 
-# Pocket
-config_h.set_quoted('GOA_POCKET_NAME', 'pocket')
-
-pocket_client_id = get_option('pocket_client_id')
-config_h.set_quoted('GOA_POCKET_CLIENT_ID', pocket_client_id)
-
-enable_pocket = get_option('pocket')
-config_h.set('GOA_POCKET_ENABLED', enable_pocket)
-
 # Windows Live
 config_h.set_quoted('GOA_WINDOWS_LIVE_NAME', 'windows_live')
 
@@ -338,10 +329,6 @@ output += '\n'
 output += '        Media Server provider:          ' + enable_media_server.to_string() + '\n'
 output += '        Microsoft Exchange provider:    ' + enable_exchange.to_string() + '\n'
 output += '        ownCloud provider:              ' + enable_owncloud.to_string() + '\n'
-output += '        Pocket provider:                ' + enable_pocket.to_string()
-if enable_pocket
-  output += ' (id:@0@)'.format(pocket_client_id)
-endif
 output += '\n'
 output += '        Windows Live provider:          ' + enable_windows_live.to_string()
 if enable_windows_live
diff --git a/meson_options.txt b/meson_options.txt
index 5e40150b..49460a9c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -29,9 +29,6 @@ option('media_server', type: 'boolean', value: false, description: 'Enable Media
 
 option('owncloud', type: 'boolean', value: true, description: 'Enable ownCloud provider')
 
-option('pocket', type: 'boolean', value: true, description: 'Enable Pocket provider')
-option('pocket_client_id', type: 'string', value: '16630-40b25246b56e8ad5310b2883', description: 'Pocket 
OAuth 2.0 client id')
-
 option('windows_live', type: 'boolean', value: true, description: 'Enable Windows Live provider')
 option('windows_live_client_id', type: 'string', value: '0000000044067703', description: 'Windows Live OAuth 
2.0 client id')
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 735f974b..0e25bbae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,7 +16,6 @@ src/goabackend/goamediaserverprovider.c
 src/goabackend/goaoauth2provider.c
 src/goabackend/goaoauthprovider.c
 src/goabackend/goaowncloudprovider.c
-src/goabackend/goapocketprovider.c
 src/goabackend/goaprovider.c
 src/goabackend/goasmtpauth.c
 src/goabackend/goautils.c
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 01176353..c3237a69 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -27,7 +27,7 @@ lastfm_shout_LDADD = $(GLIB_LIBS) $(REST_LIBS) ../goa/libgoa-1.0.la
 lastfm_shout_LDFLAGS = $(WARN_LDFLAGS)
 
 if BUILD_BACKEND
-noinst_PROGRAMS += introspect-providers list-providers add-pocket
+noinst_PROGRAMS += introspect-providers list-providers
 
 introspect_providers_SOURCES = introspect-providers.c
 introspect_providers_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
@@ -38,11 +38,6 @@ list_providers_SOURCES = list-providers.c
 list_providers_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
 list_providers_LDADD = $(GLIB_LIBS) $(GTK_LIBS) ../goabackend/libgoa-backend-1.0.la ../goa/libgoa-1.0.la
 list_providers_LDFLAGS = $(WARN_LDFLAGS)
-
-add_pocket_SOURCES = add-pocket.c
-add_pocket_CFLAGS = $(GLIB_CFLAGS) $(REST_CFLAGS)
-add_pocket_LDADD = $(GLIB_LIBS) $(REST_LIBS) ../goa/libgoa-1.0.la
-add_pocket_LDFLAGS = $(WARN_LDFLAGS)
 endif
 
 clean-local :
diff --git a/src/examples/meson.build b/src/examples/meson.build
index 6edd9f15..34583296 100644
--- a/src/examples/meson.build
+++ b/src/examples/meson.build
@@ -8,7 +8,6 @@ if enable_goabackend
   programs += [
     ['introspect-providers', libgoa_backend_dep],
     ['list-providers', libgoa_backend_dep],
-    ['add-pocket', [libgoa_dep, rest_dep]]
   ]
 endif
 
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index f9517e12..051b01fa 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -92,7 +92,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goaflickrprovider.h             goaflickrprovider.c             \
        goafoursquareprovider.h         goafoursquareprovider.c         \
        goawindowsliveprovider.h        goawindowsliveprovider.c        \
-       goapocketprovider.h             goapocketprovider.c             \
        goalastfmprovider.h             goalastfmprovider.c             \
        goaobjectskeletonutils.h        goaobjectskeletonutils.c        \
        goautils.h                      goautils.c                      \
diff --git a/src/goabackend/goabackendenums.h b/src/goabackend/goabackendenums.h
index 58a4d8ab..638674aa 100644
--- a/src/goabackend/goabackendenums.h
+++ b/src/goabackend/goabackendenums.h
@@ -67,7 +67,7 @@ typedef enum
  * @GOA_PROVIDER_FEATURE_PHOTOS: Photos storage services (ie. Flickr).
  * @GOA_PROVIDER_FEATURE_FILES: Files storage services (ie. WebDAV).
  * @GOA_PROVIDER_FEATURE_TICKETING: Ticketing services (ie. Kerberos).
- * @GOA_PROVIDER_FEATURE_READ_LATER: Read later services (eg. Pocket).
+ * @GOA_PROVIDER_FEATURE_READ_LATER: Deprecated; currently unused.
  * @GOA_PROVIDER_FEATURE_PRINTERS: Network printing services (e.g. Google Cloud Print).
  * @GOA_PROVIDER_FEATURE_MAPS: Maps related services (e.g. Foursquare, Facebook).
  * @GOA_PROVIDER_FEATURE_MUSIC: Music related services (e.g. Vkontakte).
diff --git a/src/goabackend/goaobjectskeletonutils.c b/src/goabackend/goaobjectskeletonutils.c
index e2ec3e73..657bffd7 100644
--- a/src/goabackend/goaobjectskeletonutils.c
+++ b/src/goabackend/goaobjectskeletonutils.c
@@ -203,26 +203,3 @@ goa_object_skeleton_attach_maps (GoaObjectSkeleton *object,
     }
   g_clear_object (&maps);
 }
-
-void
-goa_object_skeleton_attach_read_later (GoaObjectSkeleton *object,
-                                       gboolean           read_later_enabled)
-{
-  GoaReadLater *readlater = NULL;
-
-  readlater = goa_object_get_read_later (GOA_OBJECT (object));
-  if (read_later_enabled)
-    {
-      if (readlater == NULL)
-        {
-          readlater = goa_read_later_skeleton_new ();
-          goa_object_skeleton_set_read_later (object, readlater);
-        }
-    }
-  else
-    {
-      if (readlater != NULL)
-        goa_object_skeleton_set_read_later (object, NULL);
-    }
-  g_clear_object (&readlater);
-}
diff --git a/src/goabackend/goaobjectskeletonutils.h b/src/goabackend/goaobjectskeletonutils.h
index 0ebdb15e..69969528 100644
--- a/src/goabackend/goaobjectskeletonutils.h
+++ b/src/goabackend/goaobjectskeletonutils.h
@@ -55,9 +55,6 @@ void             goa_object_skeleton_attach_photos         (GoaObjectSkeleton *o
 void             goa_object_skeleton_attach_printers       (GoaObjectSkeleton *object,
                                                             gboolean           printers_enabled);
 
-void             goa_object_skeleton_attach_read_later     (GoaObjectSkeleton *object,
-                                                            gboolean           read_later_enabled);
-
 G_END_DECLS
 
 #endif /* __GOA_OBJECT_SKELETON_UTILS_H__ */
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index f1122791..cc3f2479 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -30,7 +30,6 @@
 #include "goaflickrprovider.h"
 #include "goafoursquareprovider.h"
 #include "goawindowsliveprovider.h"
-#include "goapocketprovider.h"
 #include "goamediaserverprovider.h"
 #include "goalastfmprovider.h"
 
@@ -947,9 +946,6 @@ static struct
 #ifdef GOA_FLICKR_ENABLED
   { GOA_FLICKR_NAME, goa_flickr_provider_get_type },
 #endif
-#ifdef GOA_POCKET_ENABLED
-  { GOA_POCKET_NAME, goa_pocket_provider_get_type },
-#endif
 #ifdef GOA_FOURSQUARE_ENABLED
   { GOA_FOURSQUARE_NAME, goa_foursquare_provider_get_type },
 #endif
diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build
index 2c3a9cff..f36482a2 100644
--- a/src/goabackend/meson.build
+++ b/src/goabackend/meson.build
@@ -43,7 +43,6 @@ sources = enum_sources + files(
   'goamediaserverprovider.c',
   'goaobjectskeletonutils.c',
   'goaowncloudprovider.c',
-  'goapocketprovider.c',
   'goaprovider.c',
   'goarestproxy.c',
   'goasmtpauth.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]