GNOME.org
 

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

commit 5a8d6ee42c5a471e4c8bae9cab35e069d7ddcb9b
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                     |  101 ----------
 src/goabackend/Makefile.am               |    1 -
 src/goabackend/goaprovider.c             |    4 -
 src/goabackend/goatwitterprovider.c      |  302 ------------------------------
 src/goabackend/goatwitterprovider.h      |   44 -----
 21 files changed, 1 insertions(+), 500 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7458db1..67ff1d4 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
 
-# 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,
@@ -460,7 +436,6 @@ echo "
        Microsoft Exchange provider:    ${enable_exchange}
        ownCloud provider:              ${enable_owncloud}
        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 8796dd2..415f9d6 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-twitter.png         \
        goa-account-yahoo.png           \
        $(NULL)
 
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 33decea..5987133 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-twitter.png         \
        goa-account-yahoo.png           \
        $(NULL)
 
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index bd25457..5a5cc2f 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-twitter.png         \
        goa-account-yahoo.png           \
        $(NULL)
 
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 67e8c00..432f825 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-twitter.png         \
        goa-account-yahoo.png           \
        $(NULL)
 
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 75063e7..50fdc73 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-twitter.png         \
        goa-account-yahoo.png           \
        $(NULL)
 
diff --git a/doc/goa-docs.xml b/doc/goa-docs.xml
index 1adacef..5cb8a2a 100644
--- a/doc/goa-docs.xml
+++ b/doc/goa-docs.xml
@@ -171,7 +171,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"/>
       <xi:include href="xml/goaflickrprovider.xml"/>
     </chapter>
   </part>
diff --git a/doc/goa-sections.txt b/doc/goa-sections.txt
index 31caff6..21c4fbf 100644
--- a/doc/goa-sections.txt
+++ b/doc/goa-sections.txt
@@ -556,16 +556,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>goaflickrprovider</FILE>
 GoaFlickrProvider
 <SUBSECTION Standard>
diff --git a/doc/goa.types b/doc/goa.types
index 4831f43..c88c0af 100644
--- a/doc/goa.types
+++ b/doc/goa.types
@@ -33,6 +33,5 @@ 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_flickr_provider_get_type
 goa_windows_live_provider_get_type
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f61ba73..1829013 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,6 @@ src/goabackend/goaoauthprovider.c
 src/goabackend/goaowncloudprovider.c
 src/goabackend/goaprovider.c
 src/goabackend/goasmtpauthplain.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 1b2b2d9..9e679f7 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -15,7 +15,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)
@@ -25,10 +25,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 e7736bb..7986146 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -73,7 +73,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goaimapsmtpprovider.h           goaimapsmtpprovider.c           \
        goaowncloudprovider.h           goaowncloudprovider.c           \
        goayahooprovider.h              goayahooprovider.c              \
-       goatwitterprovider.h            goatwitterprovider.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 c49cbff..4288112 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -34,7 +34,6 @@
 #include "goaimapsmtpprovider.h"
 #include "goaowncloudprovider.h"
 #include "goayahooprovider.h"
-#include "goatwitterprovider.h"
 #include "goaflickrprovider.h"
 #include "goawindowsliveprovider.h"
 
@@ -688,9 +687,6 @@ ensure_builtins_loaded (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]