GNOME.org
 

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

commit d4faf43db4ca1a2cfd7b1dcdf466fc465cefd783
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             |    2 -
 src/goabackend/goabackendtypes.h       |    6 -
 src/goabackend/goaprovider.c           |    4 -
 src/goabackend/goautils.c              |    2 +-
 src/goabackend/goayahooprovider.c      |  364 --------------------------------
 src/goabackend/goayahooprovider.h      |   42 ----
 21 files changed, 1 insertions(+), 462 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c5e2614..201f2ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,30 +115,6 @@ if test "$enable_google" != "no"; then
   AC_DEFINE(GOA_GOOGLE_ENABLED, 1, [Enable Google 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])],
@@ -319,7 +295,6 @@ echo "
 	Google provider:                ${enable_google} (OAuth 1.0, key:${with_google_consumer_key} secret:${with_google_consumer_secret})
 	Microsoft Exchange provider:    ${enable_exchange}
 	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 f377891..1dea233 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA =				\
 	goa-account.png			\
 	goa-account-facebook.png	\
 	goa-account-google.png		\
-	goa-account-yahoo.png		\
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index b656971..3f4bfe0 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA = 				\
 	goa-account.png			\
 	goa-account-facebook.png	\
 	goa-account-google.png		\
-	goa-account-yahoo.png		\
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 6492097..8a24ba8 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA = 				\
 	goa-account.png			\
 	goa-account-facebook.png	\
 	goa-account-google.png		\
-	goa-account-yahoo.png		\
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 68b1e2c..91494d7 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA = 				\
 	goa-account.png			\
 	goa-account-facebook.png	\
 	goa-account-google.png		\
-	goa-account-yahoo.png		\
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 5861cfe..099618e 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -5,7 +5,6 @@ icon_DATA = 				\
 	goa-account.png			\
 	goa-account-facebook.png	\
 	goa-account-google.png		\
-	goa-account-yahoo.png		\
 	$(NULL)
 
 EXTRA_DIST = \
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index b78e8d4..d25b484 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -154,7 +154,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"/>
     </chapter>
   </part>
 
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 2c95025..58aae26 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -507,16 +507,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>GoaMail</FILE>
 GoaMail
 GoaMailIface
diff --git a/doc/goa.types b/doc/goa.types
index 66ad97e..4d1692e 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -26,5 +26,4 @@ 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_windows_live_provider_get_type
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aad370e..44cd12c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,6 @@ src/goabackend/goaprovider.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 2d3aa94..2129aa0 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -53,7 +53,6 @@ libgoa_backend_1_0_la_HEADERS =						\
 	goaexchangeprovider.h						\
 	goagoogleprovider.h						\
 	goafacebookprovider.h						\
-	goayahooprovider.h						\
 	goawindowsliveprovider.h					\
 	$(NULL)
 
@@ -75,7 +74,6 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goaoauth2provider.h		goaoauth2provider.c		\
 	goagoogleprovider.h		goagoogleprovider.c		\
 	goafacebookprovider.h		goafacebookprovider.c		\
-	goayahooprovider.h		goayahooprovider.c		\
 	goawindowsliveprovider.h	goawindowsliveprovider.c	\
 	goautils.h			goautils.c			\
 	goawebview.h			goawebview.c			\
diff --git a/src/goabackend/goabackendtypes.h b/src/goabackend/goabackendtypes.h
index ee8b4bf..dc06676 100644
--- a/src/goabackend/goabackendtypes.h
+++ b/src/goabackend/goabackendtypes.h
@@ -57,12 +57,6 @@ typedef struct _GoaGoogleProvider GoaGoogleProvider;
 struct _GoaFacebookProvider;
 typedef struct _GoaFacebookProvider GoaFacebookProvider;
 
-struct _GoaYahooProvider;
-typedef struct _GoaYahooProvider GoaYahooProvider;
-
-struct _GoaTwitterProvider;
-typedef struct _GoaTwitterProvider GoaTwitterProvider;
-
 struct _GoaEditableLabel;
 typedef struct _GoaEditableLabel GoaEditableLabel;
 
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 405529c..6211629 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -30,7 +30,6 @@
 #include "goaexchangeprovider.h"
 #include "goagoogleprovider.h"
 #include "goafacebookprovider.h"
-#include "goayahooprovider.h"
 #include "goawindowsliveprovider.h"
 
 #ifdef GOA_KERBEROS_ENABLED
@@ -632,9 +631,6 @@ ensure_ep_and_builtins (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 69d8bf5..c599945 100644
--- a/src/goabackend/goautils.c
+++ b/src/goabackend/goautils.c
@@ -252,7 +252,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]