GNOME.org
 

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

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

    Remove Twitter 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-twitter.png |  Bin 622 -> 0 bytes
 data/icons/22x22/Makefile.am             |    1 -
 data/icons/22x22/goa-account-twitter.png |  Bin 757 -> 0 bytes
 data/icons/24x24/Makefile.am             |    1 -
 data/icons/24x24/goa-account-twitter.png |  Bin 764 -> 0 bytes
 data/icons/32x32/Makefile.am             |    1 -
 data/icons/32x32/goa-account-twitter.png |  Bin 958 -> 0 bytes
 data/icons/48x48/Makefile.am             |    1 -
 data/icons/48x48/goa-account-twitter.png |  Bin 1484 -> 0 bytes
 doc/goa-docs.xml                         |    1 -
 doc/goa-sections.txt                     |   10 -
 doc/goa.types                            |    1 -
 po/POTFILES.in                           |    1 -
 src/examples/Makefile.am                 |    6 +-
 src/examples/tweet.c                     |  103 ----------
 src/goabackend/Makefile.am               |    2 -
 src/goabackend/goabackend.h              |    2 -
 src/goabackend/goaprovider.c             |    4 -
 src/goabackend/goatwitterprovider.c      |  300 ------------------------------
 src/goabackend/goatwitterprovider.h      |   42 ----
 22 files changed, 1 insertions(+), 501 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a5eab06..c5e2614 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
 
-# Twitter
-AC_ARG_ENABLE([twitter], [AS_HELP_STRING([--enable-twitter], [Enable Twitter provider])], [], [enable_twitter=no])
-AC_ARG_WITH(twitter-consumer-key,
-            [AS_HELP_STRING([--with-twitter-consumer-key],
-                            [Twitter OAuth 1.0 consumer key])],
-                            [],
-                            [])
-AC_ARG_WITH(twitter-consumer-secret,
-            [AS_HELP_STRING([--with-twitter-consumer-secret],
-                            [Twitter OAuth 1.0 consumer secret])],
-                            [],
-                            [])
-if test "$with_twitter_consumer_key" = ""; then
-  with_twitter_consumer_key=not_set
-fi
-if test "$with_twitter_consumer_secret" = ""; then
-  with_twitter_consumer_secret=not_set
-fi
-AC_DEFINE_UNQUOTED(GOA_TWITTER_CONSUMER_KEY, ["$with_twitter_consumer_key"], [Twitter OAuth 1.0 consumer key])
-AC_DEFINE_UNQUOTED(GOA_TWITTER_CONSUMER_SECRET, ["$with_twitter_consumer_secret"], [Twitter OAuth 1.0 consumer secret])
-if test "$enable_twitter" != "no"; then
-  AC_DEFINE(GOA_TWITTER_ENABLED, 1, [Enable Twitter 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,
@@ -343,7 +319,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}
-	Twitter provider:               ${enable_twitter} (OAuth 1.0, key:${with_twitter_consumer_key} secret:${with_twitter_consumer_secret})
 	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 54688e2..f377891 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-twitter.png		\
 	goa-account-yahoo.png		\
 	$(NULL)
 
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index b3826c5..b656971 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-twitter.png		\
 	goa-account-yahoo.png		\
 	$(NULL)
 
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index a8ee709..6492097 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-twitter.png		\
 	goa-account-yahoo.png		\
 	$(NULL)
 
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 94703a1..68b1e2c 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-twitter.png		\
 	goa-account-yahoo.png		\
 	$(NULL)
 
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 2d106b1..5861cfe 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-twitter.png		\
 	goa-account-yahoo.png		\
 	$(NULL)
 
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index c5421cb..b78e8d4 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -155,7 +155,6 @@
       <xi:include href="xml/goawindowsliveprovider.xml"/>
       <xi:include href="xml/goafacebookprovider.xml"/>
       <xi:include href="xml/goayahooprovider.xml"/>
-      <xi:include href="xml/goatwitterprovider.xml"/>
     </chapter>
   </part>
 
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 217211a..2c95025 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -517,16 +517,6 @@ goa_yahoo_provider_get_type
 </SECTION>
 
 <SECTION>
-<FILE>goatwitterprovider</FILE>
-GoaTwitterProvider
-<SUBSECTION Standard>
-GOA_TWITTER_PROVIDER
-GOA_IS_TWITTER_PROVIDER
-GOA_TYPE_TWITTER_PROVIDER
-goa_twitter_provider_get_type
-</SECTION>
-
-<SECTION>
 <FILE>GoaMail</FILE>
 GoaMail
 GoaMailIface
diff --git a/doc/goa.types b/doc/goa.types
index d3c29e5..66ad97e 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -27,5 +27,4 @@ goa_oauth2_provider_get_type
 goa_google_provider_get_type
 goa_facebook_provider_get_type
 goa_yahoo_provider_get_type
-goa_twitter_provider_get_type
 goa_windows_live_provider_get_type
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6986845..aad370e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ src/goabackend/goakerberosprovider.c
 src/goabackend/goaoauth2provider.c
 src/goabackend/goaoauthprovider.c
 src/goabackend/goaprovider.c
-src/goabackend/goatwitterprovider.c
 src/goabackend/goautils.c
 src/goabackend/goawebview.c
 src/goabackend/goawindowsliveprovider.c
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 829c9e5..2a6570f 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = 							\
 	$(WARN_CFLAGS)						\
 	$(NULL)
 
-noinst_PROGRAMS = list-providers list-accounts tweet
+noinst_PROGRAMS = list-providers list-accounts
 
 list_providers_SOURCES = list-providers.c
 list_providers_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS)
@@ -24,10 +24,6 @@ list_accounts_SOURCES = list-accounts.c
 list_accounts_CFLAGS = $(GLIB_CFLAGS)
 list_accounts_LDADD = $(GLIB_LIBS) ../goa/libgoa-1.0.la
 
-tweet_SOURCES = tweet.c
-tweet_CFLAGS = $(GLIB_CFLAGS) $(REST_CFLAGS)
-tweet_LDADD = $(GLIB_LIBS) $(REST_LIBS) ../goa/libgoa-1.0.la
-
 clean-local :
 	rm -f *~
 
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index bfd2239..2d3aa94 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -54,7 +54,6 @@ libgoa_backend_1_0_la_HEADERS =						\
 	goagoogleprovider.h						\
 	goafacebookprovider.h						\
 	goayahooprovider.h						\
-	goatwitterprovider.h						\
 	goawindowsliveprovider.h					\
 	$(NULL)
 
@@ -77,7 +76,6 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goagoogleprovider.h		goagoogleprovider.c		\
 	goafacebookprovider.h		goafacebookprovider.c		\
 	goayahooprovider.h		goayahooprovider.c		\
-	goatwitterprovider.h		goatwitterprovider.c		\
 	goawindowsliveprovider.h	goawindowsliveprovider.c	\
 	goautils.h			goautils.c			\
 	goawebview.h			goawebview.c			\
diff --git a/src/goabackend/goabackend.h b/src/goabackend/goabackend.h
index bae963b..4b2aae2 100644
--- a/src/goabackend/goabackend.h
+++ b/src/goabackend/goabackend.h
@@ -34,8 +34,6 @@
 #include <goabackend/goaprovider.h>
 #include <goabackend/goagoogleprovider.h>
 #include <goabackend/goafacebookprovider.h>
-#include <goabackend/goayahooprovider.h>
-#include <goabackend/goatwitterprovider.h>
 #undef __GOA_BACKEND_INSIDE_GOA_BACKEND_H__
 
 #endif /* __GOA_BACKEND_H__ */
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index acfdd1a..405529c 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -31,7 +31,6 @@
 #include "goagoogleprovider.h"
 #include "goafacebookprovider.h"
 #include "goayahooprovider.h"
-#include "goatwitterprovider.h"
 #include "goawindowsliveprovider.h"
 
 #ifdef GOA_KERBEROS_ENABLED
@@ -636,9 +635,6 @@ ensure_ep_and_builtins (void)
 #ifdef GOA_YAHOO_ENABLED
       type = GOA_TYPE_YAHOO_PROVIDER;
 #endif
-#ifdef GOA_TWITTER_ENABLED
-      type = GOA_TYPE_TWITTER_PROVIDER;
-#endif
 
       type = type; /* silence -Wunused-but-set-variable */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]