GNOME.org
 

[gnome-online-accounts/wip/rishi/remove-todoist] Remove Todoist and deprecate org.gnome.OnlineAccounts.Todo

commit 19fc94a58b6c3a101188a8d5fe631c79881b00e8
Author: Debarshi Ray <rishi fedoraproject org>
Date:   Mon Oct 1 18:44:37 2018 +0200

    Remove Todoist and deprecate org.gnome.OnlineAccounts.Todo

 README                                   |   6 -
 configure.ac                             |  27 ---
 data/dbus-interfaces.xml                 |   8 +-
 data/icons/16x16/Makefile.am             |   1 -
 data/icons/16x16/goa-account-todoist.png | Bin 740 -> 0 bytes
 data/icons/22x22/Makefile.am             |   1 -
 data/icons/22x22/goa-account-todoist.png | Bin 948 -> 0 bytes
 data/icons/24x24/Makefile.am             |   1 -
 data/icons/24x24/goa-account-todoist.png | Bin 972 -> 0 bytes
 data/icons/32x32/Makefile.am             |   1 -
 data/icons/32x32/goa-account-todoist.png | Bin 1377 -> 0 bytes
 data/icons/48x48/Makefile.am             |   1 -
 data/icons/48x48/goa-account-todoist.png | Bin 2022 -> 0 bytes
 data/icons/96x96/Makefile.am             |   1 -
 data/icons/96x96/goa-account-todoist.png | Bin 4512 -> 0 bytes
 data/icons/meson.build                   |   1 -
 meson.build                              |  17 --
 meson_options.txt                        |   4 -
 po/POTFILES.in                           |   1 -
 src/goabackend/Makefile.am               |   1 -
 src/goabackend/goabackendenums.h         |   1 +
 src/goabackend/goaobjectskeletonutils.c  |  23 ---
 src/goabackend/goaobjectskeletonutils.h  |   3 -
 src/goabackend/goaprovider.c             |   4 -
 src/goabackend/goatodoistprovider.c      | 342 -------------------------------
 src/goabackend/goatodoistprovider.h      |  37 ----
 src/goabackend/meson.build               |   1 -
 27 files changed, 8 insertions(+), 474 deletions(-)
---
diff --git a/README b/README
index 6973165a..b4e3a2aa 100644
--- a/README
+++ b/README
@@ -71,12 +71,6 @@ useful:
 http://www.slideshare.net/KuoE0/pocket-authentication-with-oauth-on-firefox-os
 
 
-Todoist
--------
-
-OAuth 2.0: https://developer.todoist.com/
-
-
 Windows Live
 ------------
 
diff --git a/configure.ac b/configure.ac
index 6c3aa599..1ab97ffd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,32 +285,6 @@ if test "$enable_facebook" != "no"; then
   AC_DEFINE(GOA_FACEBOOK_ENABLED, 1, [Enable Facebook data provider])
 fi
 
-# Todoist
-AC_DEFINE(GOA_TODOIST_NAME, ["todoist"], [ProviderType and extension point name])
-AC_ARG_ENABLE([todoist],
-              [AS_HELP_STRING([--enable-todoist], [Enable Todoist provider])],
-              [],
-              [enable_todoist=no])
-AC_ARG_WITH(todoist-client-id,
-            [AS_HELP_STRING([--with-todoist-client-id], [Todoist OAuth 2.0 client id])],
-            [],
-            [])
-AC_ARG_WITH(todoist-client-secret,
-            [AS_HELP_STRING([--with-todoist-client-secret], [Todoist client secret])],
-            [],
-            [])
-if test "$with_todoist_client_id" = ""; then
-  with_todoist_client_id="2e41575c1dd74f98ad7cfb178e1ba3dd"
-fi
-if test "$with_todoist_client_secret" = ""; then
-  with_todoist_client_secret="3e59831ffdd64633918d19aa0a1efd2b"
-fi
-AC_DEFINE_UNQUOTED(GOA_TODOIST_CLIENT_ID, ["$with_todoist_client_id"], [Todoist OAuth 2.0 client id])
-AC_DEFINE_UNQUOTED(GOA_TODOIST_CLIENT_SECRET, ["$with_todoist_client_secret"], [Todoist client secret])
-if test "$enable_todoist" != "no"; then
-  AC_DEFINE(GOA_TODOIST_ENABLED, 1, [Enable Todoist data provider])
-fi
-
 # Windows Live
 AC_DEFINE(GOA_WINDOWS_LIVE_NAME, ["windows_live"], [ProviderType and extension point name])
 AC_ARG_ENABLE([windows-live],
@@ -574,7 +548,6 @@ echo "
        ownCloud provider:              ${enable_owncloud}
        Kerberos provider:              ${enable_kerberos}
        Facebook provider:              ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id})
-       Todoist provider:               ${enable_todoist} (OAuth 2.0, id:${with_todoist_client_id} 
secret:${with_todoist_client_secret})
        Windows Live provider:          ${enable_windows_live} (OAuth 2.0, id:${with_windows_live_client_id})
         Pocket provider:                ${enable_pocket} (id:${with_pocket_client_id})
        Last.fm provider:               ${enable_lastfm} (id:${with_lastfm_client_id} 
secret:${with_lastfm_client_secret})
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 205ce045..0d446f21 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -255,8 +255,13 @@
 
          Note that the #org.gnomeOnlineAccounts.Todo interface is added or
          removed from the account asynchronously.
+
+         Deprecated: 3.32: The #org.gnome.OnlineAccounts.Todo interface is not
+         used by any account.
     -->
-    <property name="TodoDisabled" type="b" access="readwrite"/>
+    <property name="TodoDisabled" type="b" access="readwrite">
+      <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
+    </property>
 
     <!-- ReadLaterDisabled:
          @since: 3.12.0
@@ -799,6 +804,7 @@
       todo-like capabilities.
   -->
   <interface name="org.gnome.OnlineAccounts.Todo">
+    <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
   </interface>
 
   <!--
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 38c1d22a..26c54c88 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-owncloud.png        \
        goa-account-pocket.png          \
        goa-account-foursquare.png      \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 4ca45d31..a4b1fc6a 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-owncloud.png        \
        goa-account-pocket.png          \
        goa-account-foursquare.png      \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 0d45d8ac..721e1f80 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-pocket.png          \
        goa-account-foursquare.png      \
        goa-account-flickr.png          \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 8a0b612c..a13313de 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-owncloud.png        \
        goa-account-pocket.png          \
        goa-account-foursquare.png      \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 82323095..e86a6e47 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-pocket.png          \
        goa-account-flickr.png          \
        goa-account-foursquare.png      \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/96x96/Makefile.am b/data/icons/96x96/Makefile.am
index bc174ef9..0cfa9ddb 100644
--- a/data/icons/96x96/Makefile.am
+++ b/data/icons/96x96/Makefile.am
@@ -10,7 +10,6 @@ icon_DATA =                           \
        goa-account-pocket.png          \
        goa-account-flickr.png          \
        goa-account-foursquare.png      \
-       goa-account-todoist.png \
        $(NULL)
 
 EXTRA_DIST = \
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 866e2f9e..79deee22 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -7,7 +7,6 @@ icon_data = [
   'goa-account-owncloud.png',
   'goa-account.png',
   'goa-account-pocket.png',
-  'goa-account-todoist.png'
 ]
 
 icon_data_256 = ['goa-account.png']
diff --git a/meson.build b/meson.build
index 6a706a76..d59ad302 100644
--- a/meson.build
+++ b/meson.build
@@ -220,18 +220,6 @@ config_h.set_quoted('GOA_POCKET_CLIENT_ID', pocket_client_id)
 enable_pocket = get_option('pocket')
 config_h.set('GOA_POCKET_ENABLED', enable_pocket)
 
-# Todoist
-config_h.set_quoted('GOA_TODOIST_NAME', 'todoist')
-
-todoist_client_id = get_option('todoist_client_id')
-config_h.set_quoted('GOA_TODOIST_CLIENT_ID', todoist_client_id)
-
-todoist_client_secret = get_option('todoist_client_secret')
-config_h.set_quoted('GOA_TODOIST_CLIENT_SECRET', todoist_client_secret)
-
-enable_todoist = get_option('todoist')
-config_h.set('GOA_TODOIST_ENABLED', enable_todoist)
-
 # Windows Live
 config_h.set_quoted('GOA_WINDOWS_LIVE_NAME', 'windows_live')
 
@@ -359,11 +347,6 @@ if enable_pocket
   output += ' (id:@0@)'.format(pocket_client_id)
 endif
 output += '\n'
-output += '        Todoist provider:               ' + enable_todoist.to_string()
-if enable_todoist
-  output += ' (OAuth 2.0, id:@0@ secret:@1@)'.format(todoist_client_id, todoist_client_secret)
-endif
-output += '\n'
 output += '        Windows Live provider:          ' + enable_windows_live.to_string()
 if enable_windows_live
   output += ' (OAuth 2.0, id:@0@)'.format(windows_live_client_id)
diff --git a/meson_options.txt b/meson_options.txt
index 2948a650..5e40150b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -32,10 +32,6 @@ option('owncloud', type: 'boolean', value: true, description: 'Enable ownCloud p
 option('pocket', type: 'boolean', value: true, description: 'Enable Pocket provider')
 option('pocket_client_id', type: 'string', value: '16630-40b25246b56e8ad5310b2883', description: 'Pocket 
OAuth 2.0 client id')
 
-option('todoist', type: 'boolean', value: false, description: 'Enable Todoist provider')
-option('todoist_client_id', type: 'string', value: '2e41575c1dd74f98ad7cfb178e1ba3dd', description: 'Todoist 
OAuth 2.0 client id')
-option('todoist_client_secret', type: 'string', value: '3e59831ffdd64633918d19aa0a1efd2b', description: 
'Todoist client secret')
-
 option('windows_live', type: 'boolean', value: true, description: 'Enable Windows Live provider')
 option('windows_live_client_id', type: 'string', value: '0000000044067703', description: 'Windows Live OAuth 
2.0 client id')
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 81394795..735f974b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,6 @@ src/goabackend/goaowncloudprovider.c
 src/goabackend/goapocketprovider.c
 src/goabackend/goaprovider.c
 src/goabackend/goasmtpauth.c
-src/goabackend/goatodoistprovider.c
 src/goabackend/goautils.c
 src/goabackend/goawebview.c
 src/goabackend/goawindowsliveprovider.c
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index ed04d0fd..ca9afd6f 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -95,7 +95,6 @@ libgoa_backend_1_0_la_SOURCES =                                               \
        goawindowsliveprovider.h        goawindowsliveprovider.c        \
        goapocketprovider.h             goapocketprovider.c             \
        goalastfmprovider.h             goalastfmprovider.c             \
-       goatodoistprovider.h            goatodoistprovider.c            \
        goaobjectskeletonutils.h        goaobjectskeletonutils.c        \
        goautils.h                      goautils.c                      \
        goawebview.h                    goawebview.c                    \
diff --git a/src/goabackend/goabackendenums.h b/src/goabackend/goabackendenums.h
index 5ddfed56..58a4d8ab 100644
--- a/src/goabackend/goabackendenums.h
+++ b/src/goabackend/goabackendenums.h
@@ -71,6 +71,7 @@ typedef enum
  * @GOA_PROVIDER_FEATURE_PRINTERS: Network printing services (e.g. Google Cloud Print).
  * @GOA_PROVIDER_FEATURE_MAPS: Maps related services (e.g. Foursquare, Facebook).
  * @GOA_PROVIDER_FEATURE_MUSIC: Music related services (e.g. Vkontakte).
+ * @GOA_PROVIDER_FEATURE_TODO: Deprecated; currently unused.
  * @GOA_PROVIDER_FEATURE_INVALID: Used for error handling. No provider
  *   should provide this feature.
  *
diff --git a/src/goabackend/goaobjectskeletonutils.c b/src/goabackend/goaobjectskeletonutils.c
index 8737be2e..e2ec3e73 100644
--- a/src/goabackend/goaobjectskeletonutils.c
+++ b/src/goabackend/goaobjectskeletonutils.c
@@ -204,29 +204,6 @@ goa_object_skeleton_attach_maps (GoaObjectSkeleton *object,
   g_clear_object (&maps);
 }
 
-void
-goa_object_skeleton_attach_todo (GoaObjectSkeleton *object,
-                                 gboolean           todo_enabled)
-{
-  GoaTodo *todo = NULL;
-
-  todo = goa_object_get_todo (GOA_OBJECT (object));
-  if (todo_enabled)
-    {
-      if (todo == NULL)
-        {
-          todo = goa_todo_skeleton_new ();
-          goa_object_skeleton_set_todo (object, todo);
-        }
-    }
-  else
-    {
-      if (todo != NULL)
-        goa_object_skeleton_set_todo (object, NULL);
-    }
-  g_clear_object (&todo);
-}
-
 void
 goa_object_skeleton_attach_read_later (GoaObjectSkeleton *object,
                                        gboolean           read_later_enabled)
diff --git a/src/goabackend/goaobjectskeletonutils.h b/src/goabackend/goaobjectskeletonutils.h
index 124d12b9..0ebdb15e 100644
--- a/src/goabackend/goaobjectskeletonutils.h
+++ b/src/goabackend/goaobjectskeletonutils.h
@@ -55,9 +55,6 @@ void             goa_object_skeleton_attach_photos         (GoaObjectSkeleton *o
 void             goa_object_skeleton_attach_printers       (GoaObjectSkeleton *object,
                                                             gboolean           printers_enabled);
 
-void             goa_object_skeleton_attach_todo           (GoaObjectSkeleton *object,
-                                                            gboolean           todo_enabled);
-
 void             goa_object_skeleton_attach_read_later     (GoaObjectSkeleton *object,
                                                             gboolean           read_later_enabled);
 
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 70930d87..f1122791 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -33,7 +33,6 @@
 #include "goapocketprovider.h"
 #include "goamediaserverprovider.h"
 #include "goalastfmprovider.h"
-#include "goatodoistprovider.h"
 
 #ifdef GOA_KERBEROS_ENABLED
 #include "goakerberosprovider.h"
@@ -960,9 +959,6 @@ static struct
 #ifdef GOA_LASTFM_ENABLED
   { GOA_LASTFM_NAME, goa_lastfm_provider_get_type },
 #endif
-#ifdef GOA_TODOIST_ENABLED
-  { GOA_TODOIST_NAME, goa_todoist_provider_get_type },
-#endif
 #ifdef GOA_IMAP_SMTP_ENABLED
   { GOA_IMAP_SMTP_NAME, goa_imap_smtp_provider_get_type },
 #endif
diff --git a/src/goabackend/meson.build b/src/goabackend/meson.build
index 3fb7fc1b..2c3a9cff 100644
--- a/src/goabackend/meson.build
+++ b/src/goabackend/meson.build
@@ -48,7 +48,6 @@ sources = enum_sources + files(
   'goarestproxy.c',
   'goasmtpauth.c',
   'goasouplogger.c',
-  'goatodoistprovider.c',
   'goautils.c',
   'goawebview.c',
   'goawindowsliveprovider.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]