GNOME.org
 

[gnome-online-accounts/ebassi/none-more-flickr] Remove the Flickr provider backend


commit 4b93ca6427996a7931b3ec1d182e35a68e189de0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Jun 16 15:53:31 2022 +0100

    Remove the Flickr provider backend
    
    The Flickr authentication provider still uses OAuth 1, which is going to
    be dropped from librest before the 1.0 release.
    
    Since Flickr does not support OAuth 2, and it's unlikely it'll ever
    will at this point, the choice is really made for us.

 README                                             |   6 -
 configure.ac                                       |  27 --
 data/icons/meson.build                             |   2 -
 data/icons/scalable/Makefile.am                    |   1 -
 data/icons/scalable/goa-account-flickr.svg         | 122 -------
 data/icons/symbolic/Makefile.am                    |   1 -
 .../icons/symbolic/goa-account-flickr-symbolic.svg |  43 ---
 meson.build                                        |  16 -
 meson_options.txt                                  |   4 -
 po/POTFILES.in                                     |   1 -
 src/goabackend/Makefile.am                         |   1 -
 src/goabackend/goaflickrprovider.c                 | 364 ---------------------
 src/goabackend/goaflickrprovider.h                 |  37 ---
 src/goabackend/goaprovider.c                       |   4 -
 src/goabackend/meson.build                         |   1 -
 15 files changed, 630 deletions(-)
---
diff --git a/README b/README
index 62e32fc1..97444d29 100644
--- a/README
+++ b/README
@@ -21,12 +21,6 @@ access then the error is returned in the URI's query. The URIs look like this:
   - <get_redirect_uri>?error=access_denied...#_=_
 
 
-Flickr
-------
-
-OAuth 1.0: http://www.flickr.com/services/api/auth.oauth.html
-
-
 Foursquare
 ----------
 
diff --git a/configure.ac b/configure.ac
index b49679e3..517eca6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,32 +207,6 @@ else
 fi
 AM_CONDITIONAL(BUILD_FEDORA, [test x$enable_fedora != xno])
 
-# Flickr
-AC_DEFINE(GOA_FLICKR_NAME, ["flickr"], [ProviderType and extension point name])
-AC_ARG_ENABLE([flickr],
-              [AS_HELP_STRING([--enable-flickr], [Enable Flickr provider])],
-              [],
-              [enable_flickr=yes])
-AC_ARG_WITH(flickr-consumer-key,
-            [AS_HELP_STRING([--with-flickr-consumer-key], [Flickr OAuth 1.0 consumer key])],
-            [],
-            [])
-AC_ARG_WITH(flickr-consumer-secret,
-            [AS_HELP_STRING([--with-flickr-consumer-secret], [Flickr OAuth 1.0 consumer secret])],
-            [],
-            [])
-if test "$with_flickr_consumer_key" = ""; then
-  with_flickr_consumer_key=ed00ad7e0869897506e23c0d18e34d01
-fi
-if test "$with_flickr_consumer_secret" = ""; then
-  with_flickr_consumer_secret=ebd556dd187188b1
-fi
-AC_DEFINE_UNQUOTED(GOA_FLICKR_CONSUMER_KEY, ["$with_flickr_consumer_key"], [Flickr OAuth 1.0 consumer key])
-AC_DEFINE_UNQUOTED(GOA_FLICKR_CONSUMER_SECRET, ["$with_flickr_consumer_secret"], [Flickr OAuth 1.0 consumer 
secret])
-if test "$enable_flickr" != "no"; then
-  AC_DEFINE(GOA_FLICKR_ENABLED, 1, [Enable Flickr data provider])
-fi
-
 # Foursquare
 AC_DEFINE(GOA_FOURSQUARE_NAME, ["foursquare"], [ProviderType and extension point name])
 AC_ARG_ENABLE([foursquare],
@@ -566,7 +540,6 @@ echo "
        template file:                  ${with_template_file}
 
        Fedora Account System provider: ${enable_fedora}
-       Flickr provider:                ${enable_flickr} (OAuth 1.0, key:${with_flickr_consumer_key} 
secret:${with_flickr_consumer_secret})
        Foursquare provider:            ${enable_foursquare} (id:${with_foursquare_client_id})
        Google provider:                ${enable_google} (OAuth 2.0, id:${with_google_client_id} 
secret:${with_google_client_secret})
        IMAP/SMTP provider:             ${enable_imap_smtp}
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 281c5388..7fcdc3ea 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -3,7 +3,6 @@ icon_scalable_data = [
   'goa-account-exchange.svg',
   'goa-account-facebook.svg',
   'goa-account-fedora.svg',
-  'goa-account-flickr.svg',
   'goa-account-foursquare.svg',
   'goa-account-google.svg',
   'goa-account-lastfm.svg',
@@ -15,7 +14,6 @@ icon_symbolic_data = [
   'goa-account-symbolic.svg',
   'goa-account-exchange-symbolic.svg',
   'goa-account-facebook-symbolic.svg',
-  'goa-account-flickr-symbolic.svg',
   'goa-account-foursquare-symbolic.svg',
   'goa-account-google-symbolic.svg',
   'goa-account-lastfm-symbolic.svg',
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 5721dd55..01a37541 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-exchange.svg        \
        goa-account-facebook.svg        \
        goa-account-fedora.svg          \
-       goa-account-flickr.svg          \
        goa-account-google.svg          \
        goa-account-lastfm.svg          \
        goa-account-msn.svg             \
diff --git a/data/icons/symbolic/Makefile.am b/data/icons/symbolic/Makefile.am
index 1ba8100b..e8569895 100644
--- a/data/icons/symbolic/Makefile.am
+++ b/data/icons/symbolic/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA =                                     \
        goa-account-symbolic.svg                \
        goa-account-exchange-symbolic.svg       \
        goa-account-facebook-symbolic.svg       \
-       goa-account-flickr-symbolic.svg         \
        goa-account-google-symbolic.svg         \
        goa-account-lastfm-symbolic.svg         \
        goa-account-msn-symbolic.svg            \
diff --git a/meson.build b/meson.build
index 00b168b6..70f6d467 100644
--- a/meson.build
+++ b/meson.build
@@ -146,18 +146,6 @@ if enable_fedora
 endif
 config_h.set('GOA_FEDORA_ENABLED', enable_fedora)
 
-# Flickr
-config_h.set_quoted('GOA_FLICKR_NAME', 'flickr')
-
-flickr_consumer_key = get_option('flickr_consumer_key')
-config_h.set_quoted('GOA_FLICKR_CONSUMER_KEY', flickr_consumer_key)
-
-flickr_consumer_secret = get_option('flickr_consumer_secret')
-config_h.set_quoted('GOA_FLICKR_CONSUMER_SECRET', flickr_consumer_secret)
-
-enable_flickr = get_option('flickr')
-config_h.set('GOA_FLICKR_ENABLED', enable_flickr)
-
 # Foursquare
 config_h.set_quoted('GOA_FOURSQUARE_NAME', 'foursquare')
 
@@ -318,10 +306,6 @@ if enable_facebook
 endif
 output += '\n'
 output += '        Fedora Account System provider: ' + enable_fedora.to_string() + '\n'
-output += '        Flickr provider:                ' + enable_flickr.to_string()
-if enable_flickr
-  output += ' (OAuth 1.0, key:@0@)'.format(flickr_consumer_key)
-endif
 output += '\n'
 output += '        Foursquare provider:            ' + enable_foursquare.to_string()
 if enable_foursquare
diff --git a/meson_options.txt b/meson_options.txt
index 08c65ecd..4ff7571a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,10 +8,6 @@ option('facebook_client_id', type: 'string', value: '297654143624603', descripti
 
 option('fedora', type: 'boolean', value: false, description: 'Enable Fedora Account System provider')
 
-option('flickr', type: 'boolean', value: true, description: 'Enable Flickr provider')
-option('flickr_consumer_key', type: 'string', value: 'ed00ad7e0869897506e23c0d18e34d01', description: 
'Flickr OAuth 1.0 consumer key')
-option('flickr_consumer_secret', type: 'string', value: 'ebd556dd187188b1', description: 'Flickr OAuth 1.0 
consumer secret')
-
 option('foursquare', type: 'boolean', value: true, description: 'Enable Foursquare provider')
 option('foursquare_client_id', type: 'string', value: 'MBNU2NES5HASNDQJ25YPFGG2UGRZHPI3IYTNJGE0KIWT2HCF', 
description: 'Foursquare OAuth 2.0 client id')
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 279fb64d..8a0150f2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,6 @@ src/goabackend/goaewsclient.c
 src/goabackend/goaexchangeprovider.c
 src/goabackend/goafacebookprovider.c
 src/goabackend/goafedoraprovider.c
-src/goabackend/goaflickrprovider.c
 src/goabackend/goafoursquareprovider.c
 src/goabackend/goagoogleprovider.c
 src/goabackend/goaimapauthlogin.c
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 83852378..f227e527 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -89,7 +89,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goaimapsmtpprovider.h           goaimapsmtpprovider.c           \
        goamediaserverprovider.h        goamediaserverprovider.c        \
        goaowncloudprovider.h           goaowncloudprovider.c           \
-       goaflickrprovider.h             goaflickrprovider.c             \
        goafoursquareprovider.h         goafoursquareprovider.c         \
        goawindowsliveprovider.h        goawindowsliveprovider.c        \
        goalastfmprovider.h             goalastfmprovider.c             \
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 9e5bd45a..9712cd28 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -27,7 +27,6 @@
 #include "goafacebookprovider.h"
 #include "goaimapsmtpprovider.h"
 #include "goaowncloudprovider.h"
-#include "goaflickrprovider.h"
 #include "goafoursquareprovider.h"
 #include "goawindowsliveprovider.h"
 #include "goamediaserverprovider.h"
@@ -947,9 +946,6 @@ static struct
 #ifdef GOA_WINDOWS_LIVE_ENABLED
   { GOA_WINDOWS_LIVE_NAME, goa_windows_live_provider_get_type },
 #endif
-#ifdef GOA_FLICKR_ENABLED
-  { GOA_FLICKR_NAME, goa_flickr_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 3d9dee8b..393c8aca 100644
--- a/src/goabackend/meson.build
+++ b/src/goabackend/meson.build
@@ -9,7 +9,6 @@ libgoa_backend_sources = files(
   'goaewsclient.c',
   'goaexchangeprovider.c',
   'goafacebookprovider.c',
-  'goaflickrprovider.c',
   'goafoursquareprovider.c',
   'goagoogleprovider.c',
   'goahttpclient.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]