GNOME.org
 

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


commit 0f1237af5abc09b9bba4ccefa432e6d084593779
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                                             |   7 -
 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, 631 deletions(-)
---
diff --git a/README b/README
index 4a9b338e..27827935 100644
--- a/README
+++ b/README
@@ -1,13 +1,6 @@
 GNOME Online Accounts - Single sign-on framework for GNOME
 ==========================================================
 
-
-Flickr
-------
-
-OAuth 1.0: http://www.flickr.com/services/api/auth.oauth.html
-
-
 Google
 ------
 
diff --git a/configure.ac b/configure.ac
index 4e1fc3c3..62eb6a6e 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
-
 # Google
 AC_DEFINE(GOA_GOOGLE_NAME, ["google"], [ProviderType and extension point name])
 AC_ARG_ENABLE([google],
@@ -530,7 +504,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})
        Google provider:                ${enable_google} (OAuth 2.0, id:${with_google_client_id} 
secret:${with_google_client_secret})
        IMAP/SMTP provider:             ${enable_imap_smtp}
        Media Server provider:          ${enable_media_server}
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 3d9cc94c..4bd114dc 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -2,7 +2,6 @@ icon_scalable_data = [
   'goa-account.svg',
   'goa-account-exchange.svg',
   'goa-account-fedora.svg',
-  'goa-account-flickr.svg',
   'goa-account-google.svg',
   'goa-account-lastfm.svg',
   'goa-account-msn.svg',
@@ -12,7 +11,6 @@ icon_scalable_data = [
 icon_symbolic_data = [
   'goa-account-symbolic.svg',
   'goa-account-exchange-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/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index c9a83870..99a2c9de 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA =                             \
        goa-account.svg                 \
        goa-account-exchange.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 53809057..8ae952d8 100644
--- a/data/icons/symbolic/Makefile.am
+++ b/data/icons/symbolic/Makefile.am
@@ -4,7 +4,6 @@ icondir = $(datadir)/icons/hicolor/symbolic/apps
 icon_DATA =                                    \
        goa-account-symbolic.svg                \
        goa-account-exchange-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 72ad8ba3..00d9fde9 100644
--- a/meson.build
+++ b/meson.build
@@ -137,18 +137,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)
-
 # Google
 config_h.set_quoted('GOA_GOOGLE_NAME', 'google')
 
@@ -295,10 +283,6 @@ output += '        inspector:                      ' + enable_inspector.to_strin
 output += '        introspection:                  ' + enable_introspection.to_string() + '\n'
 output += '        template file:                  ' + template_file + '\n\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 += '        Google provider:                ' + enable_google.to_string()
 if enable_google
diff --git a/meson_options.txt b/meson_options.txt
index 19d0b01a..6c8f32be 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,10 +5,6 @@ option('exchange', type: 'boolean', value: true, description: 'Enable Microsoft
 
 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('google', type: 'boolean', value: true, description: 'Enable Google provider')
 option('google_client_id', type: 'string', value: 
'44438659992-7kgjeitenc16ssihbtdjbgguch7ju55s.apps.googleusercontent.com', description: 'Google OAuth 2.0 
client id')
 option('google_client_secret', type: 'string', value: '-gMLuQyDiI0XrQS_vx_mhuYF', description: 'Google OAuth 
2.0 client secret')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4f57b5aa..a089515e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ src/daemon/goadaemon.c
 src/goabackend/goaewsclient.c
 src/goabackend/goaexchangeprovider.c
 src/goabackend/goafedoraprovider.c
-src/goabackend/goaflickrprovider.c
 src/goabackend/goagoogleprovider.c
 src/goabackend/goaimapauthlogin.c
 src/goabackend/goaimapsmtpprovider.c
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index aec07354..59909c5b 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -88,7 +88,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goaimapsmtpprovider.h           goaimapsmtpprovider.c           \
        goamediaserverprovider.h        goamediaserverprovider.c        \
        goaowncloudprovider.h           goaowncloudprovider.c           \
-       goaflickrprovider.h             goaflickrprovider.c             \
        goawindowsliveprovider.h        goawindowsliveprovider.c        \
        goalastfmprovider.h             goalastfmprovider.c             \
        goaobjectskeletonutils.h        goaobjectskeletonutils.c        \
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 24a1c470..7996150e 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -26,7 +26,6 @@
 #include "goagoogleprovider.h"
 #include "goaimapsmtpprovider.h"
 #include "goaowncloudprovider.h"
-#include "goaflickrprovider.h"
 #include "goawindowsliveprovider.h"
 #include "goamediaserverprovider.h"
 #include "goalastfmprovider.h"
@@ -942,9 +941,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_EXCHANGE_ENABLED
   { GOA_EXCHANGE_NAME, goa_exchange_provider_get_type },
 #endif
diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build
index e53c8469..3706d5bf 100644
--- a/src/goabackend/meson.build
+++ b/src/goabackend/meson.build
@@ -8,7 +8,6 @@ libgoa_backend_sources = files(
   'goadlnaservermanager.c',
   'goaewsclient.c',
   'goaexchangeprovider.c',
-  'goaflickrprovider.c',
   'goagoogleprovider.c',
   'goahttpclient.c',
   'goaimapauthlogin.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]