GNOME.org
 

[gnome-online-accounts/gnome-3-8] Remove Yahoo support

commit 72cd8df7d463007db7b5fc3de51663b13cb01f5b
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Sep 4 13:46:28 2012 +0200

    Remove Yahoo support
    
    There are currently no known applications that use it, and we need to
    get the terms and conditions reviewed by the SFLC anyway. Will be
    restored once the situation changes.

 configure.ac                           |   25 ---
 data/icons/16x16/Makefile.am           |    1 -
 data/icons/16x16/goa-account-yahoo.png |  Bin 741 -> 0 bytes
 data/icons/22x22/Makefile.am           |    1 -
 data/icons/22x22/goa-account-yahoo.png |  Bin 899 -> 0 bytes
 data/icons/24x24/Makefile.am           |    1 -
 data/icons/24x24/goa-account-yahoo.png |  Bin 930 -> 0 bytes
 data/icons/32x32/Makefile.am           |    1 -
 data/icons/32x32/goa-account-yahoo.png |  Bin 1401 -> 0 bytes
 data/icons/48x48/Makefile.am           |    1 -
 data/icons/48x48/goa-account-yahoo.png |  Bin 1785 -> 0 bytes
 doc/goa-docs.xml                       |    1 -
 doc/goa-sections.txt                   |   10 -
 doc/goa.types                          |    1 -
 po/POTFILES.in                         |    1 -
 src/goabackend/Makefile.am             |    1 -
 src/goabackend/goaprovider.c           |    4 -
 src/goabackend/goautils.c              |    2 +-
 src/goabackend/goayahooprovider.c      |  366 --------------------------------
 src/goabackend/goayahooprovider.h      |   44 ----
 20 files changed, 1 insertions(+), 459 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 67ff1d4..fcf2cf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,30 +188,6 @@ if test "$enable_owncloud" != "no"; then
   AC_DEFINE(GOA_OWNCLOUD_ENABLED, 1, [Enable ownCloud data provider])
 fi
 
-# Yahoo
-AC_ARG_ENABLE([yahoo], [AS_HELP_STRING([--enable-yahoo], [Enable Yahoo provider])], [], [enable_yahoo=no])
-AC_ARG_WITH(yahoo-consumer-key,
-            [AS_HELP_STRING([--with-yahoo-consumer-key],
-                            [Yahoo OAuth 1.0 consumer key])],
-                            [],
-                            [])
-AC_ARG_WITH(yahoo-consumer-secret,
-            [AS_HELP_STRING([--with-yahoo-consumer-secret],
-                            [Yahoo OAuth 1.0 consumer secret])],
-                            [],
-                            [])
-if test "$with_yahoo_consumer_key" = ""; then
-  with_yahoo_consumer_key=not_set
-fi
-if test "$with_yahoo_consumer_secret" = ""; then
-  with_yahoo_consumer_secret=not_set
-fi
-AC_DEFINE_UNQUOTED(GOA_YAHOO_CONSUMER_KEY, ["$with_yahoo_consumer_key"], [Yahoo OAuth 1.0 consumer key])
-AC_DEFINE_UNQUOTED(GOA_YAHOO_CONSUMER_SECRET, ["$with_yahoo_consumer_secret"], [Yahoo OAuth 1.0 consumer 
secret])
-if test "$enable_yahoo" != "no"; then
-  AC_DEFINE(GOA_YAHOO_ENABLED, 1, [Enable Yahoo data provider])
-fi
-
 # Facebook
 AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook],
                                           [Enable Facebook provider])],
@@ -436,7 +412,6 @@ echo "
        Microsoft Exchange provider:    ${enable_exchange}
        ownCloud provider:              ${enable_owncloud}
        Kerberos provider:              ${enable_kerberos}
-       Yahoo provider:                 ${enable_yahoo} (OAuth 1.0, key:${with_yahoo_consumer_key} 
secret:${with_yahoo_consumer_secret})
        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})
 
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 415f9d6..31519d7 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-facebook.png        \
        goa-account-google.png          \
        goa-account-owncloud.png        \
-       goa-account-yahoo.png           \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 5987133..137e1e1 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-facebook.png        \
        goa-account-google.png          \
        goa-account-owncloud.png        \
-       goa-account-yahoo.png           \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 5a5cc2f..488b708 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-facebook.png        \
        goa-account-google.png          \
        goa-account-owncloud.png        \
-       goa-account-yahoo.png           \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 432f825..729354d 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-facebook.png        \
        goa-account-google.png          \
        goa-account-owncloud.png        \
-       goa-account-yahoo.png           \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 50fdc73..0264250 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -6,7 +6,6 @@ icon_DATA =                             \
        goa-account-facebook.png        \
        goa-account-google.png          \
        goa-account-owncloud.png        \
-       goa-account-yahoo.png           \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index 5cb8a2a..6dbdb04 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -170,7 +170,6 @@
       <xi:include href="xml/goagoogleprovider.xml"/>
       <xi:include href="xml/goawindowsliveprovider.xml"/>
       <xi:include href="xml/goafacebookprovider.xml"/>
-      <xi:include href="xml/goayahooprovider.xml"/>
       <xi:include href="xml/goaflickrprovider.xml"/>
     </chapter>
   </part>
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 21c4fbf..290cfb4 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -546,16 +546,6 @@ goa_facebook_provider_get_type
 </SECTION>
 
 <SECTION>
-<FILE>goayahooprovider</FILE>
-GoaYahooProvider
-<SUBSECTION Standard>
-GOA_YAHOO_PROVIDER
-GOA_IS_YAHOO_PROVIDER
-GOA_TYPE_YAHOO_PROVIDER
-goa_yahoo_provider_get_type
-</SECTION>
-
-<SECTION>
 <FILE>goaflickrprovider</FILE>
 GoaFlickrProvider
 <SUBSECTION Standard>
diff --git a/doc/goa.types b/doc/goa.types
index c88c0af..d5cb006 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -32,6 +32,5 @@ goa_oauth_provider_get_type
 goa_oauth2_provider_get_type
 goa_google_provider_get_type
 goa_facebook_provider_get_type
-goa_yahoo_provider_get_type
 goa_flickr_provider_get_type
 goa_windows_live_provider_get_type
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1829013..e678a13 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,7 +18,6 @@ src/goabackend/goasmtpauthplain.c
 src/goabackend/goautils.c
 src/goabackend/goawebview.c
 src/goabackend/goawindowsliveprovider.c
-src/goabackend/goayahooprovider.c
 src/goaidentity/goaalarm.c
 src/goaidentity/goaidentityservice.c
 src/goaidentity/goakerberosidentity.c
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 7986146..0f58480 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -72,7 +72,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goafacebookprovider.h           goafacebookprovider.c           \
        goaimapsmtpprovider.h           goaimapsmtpprovider.c           \
        goaowncloudprovider.h           goaowncloudprovider.c           \
-       goayahooprovider.h              goayahooprovider.c              \
        goaflickrprovider.h             goaflickrprovider.c             \
        goawindowsliveprovider.h        goawindowsliveprovider.c        \
        goautils.h                      goautils.c                      \
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 4288112..4fa30cf 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -33,7 +33,6 @@
 #include "goafacebookprovider.h"
 #include "goaimapsmtpprovider.h"
 #include "goaowncloudprovider.h"
-#include "goayahooprovider.h"
 #include "goaflickrprovider.h"
 #include "goawindowsliveprovider.h"
 
@@ -684,9 +683,6 @@ ensure_builtins_loaded (void)
 #ifdef GOA_KERBEROS_ENABLED
       type = GOA_TYPE_KERBEROS_PROVIDER;
 #endif
-#ifdef GOA_YAHOO_ENABLED
-      type = GOA_TYPE_YAHOO_PROVIDER;
-#endif
 
       type = type; /* silence -Wunused-but-set-variable */
 
diff --git a/src/goabackend/goautils.c b/src/goabackend/goautils.c
index 167752f..bd1219e 100644
--- a/src/goabackend/goautils.c
+++ b/src/goabackend/goautils.c
@@ -264,7 +264,7 @@ goa_utils_store_credentials_for_id_sync (GoaProvider   *provider,
                                   goa_provider_get_provider_type (GOA_PROVIDER (provider)),
                                   goa_provider_get_credentials_generation (GOA_PROVIDER (provider)),
                                   id);
-  /* Translators: The %s is the type of the provider, e.g. 'google' or 'yahoo' */
+  /* Translators: The %s is the type of the provider, e.g. 'google' or 'facebook' */
   password_description = g_strdup_printf (_("GOA %s credentials for identity %s"),
                                           goa_provider_get_provider_type (GOA_PROVIDER (provider)),
                                           id);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]