diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-17 13:35:57 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2021-06-17 13:35:57 +0000 |
commit | 5ddfeb75cc16b94f37bf1afd9a3bf44c3836b0bd (patch) | |
tree | 746dd5daf35bad79b7fb8635679e86ab1c8559b1 | |
parent | c6066c63a3ee84c442f7bd7bc5905205d0f7f68d (diff) | |
parent | 134677aaac73cdc17e882e2d25a836cfe6efab72 (diff) | |
download | libgdata-5ddfeb75cc16b94f37bf1afd9a3bf44c3836b0bd.tar.gz |
Merge branch 'remove-deprecated-documents' into 'master'
remove deprecated documents service api
See merge request GNOME/libgdata!37
-rw-r--r-- | docs/reference/gdata-sections.txt.in | 2 | ||||
-rw-r--r-- | gdata/gdata-core.symbols | 2 | ||||
-rw-r--r-- | gdata/services/documents/gdata-documents-entry.c | 78 | ||||
-rw-r--r-- | gdata/services/documents/gdata-documents-entry.h | 5 | ||||
-rw-r--r-- | gdata/services/documents/gdata-documents-presentation.h | 17 | ||||
-rw-r--r-- | gdata/symbol.map | 2 | ||||
-rw-r--r-- | gdata/tests/documents.c | 3 |
7 files changed, 1 insertions, 108 deletions
diff --git a/docs/reference/gdata-sections.txt.in b/docs/reference/gdata-sections.txt.in index 41d9df51..99df4afd 100644 --- a/docs/reference/gdata-sections.txt.in +++ b/docs/reference/gdata-sections.txt.in @@ -1538,8 +1538,6 @@ GDataDocumentsEntry GDataDocumentsEntryClass gdata_documents_entry_get_path gdata_documents_entry_get_resource_id -gdata_documents_entry_get_document_id -gdata_documents_entry_get_edited gdata_documents_entry_get_last_modified_by gdata_documents_entry_get_last_viewed gdata_documents_entry_get_quota_used diff --git a/gdata/gdata-core.symbols b/gdata/gdata-core.symbols index ff7c9ad6..5581495f 100644 --- a/gdata/gdata-core.symbols +++ b/gdata/gdata-core.symbols @@ -633,8 +633,6 @@ gdata_documents_metadata_get_quota_used gdata_documents_feed_get_type gdata_documents_entry_get_type gdata_documents_entry_get_path -gdata_documents_entry_get_document_id -gdata_documents_entry_get_edited gdata_documents_entry_get_last_viewed gdata_documents_entry_set_writers_can_invite gdata_documents_entry_writers_can_invite diff --git a/gdata/services/documents/gdata-documents-entry.c b/gdata/services/documents/gdata-documents-entry.c index 5c225804..8b727b81 100644 --- a/gdata/services/documents/gdata-documents-entry.c +++ b/gdata/services/documents/gdata-documents-entry.c @@ -140,9 +140,7 @@ struct _GDataDocumentsEntryPrivate { }; enum { - PROP_EDITED = 1, - PROP_LAST_VIEWED, - PROP_DOCUMENT_ID, + PROP_LAST_VIEWED = 1, PROP_LAST_MODIFIED_BY, PROP_IS_DELETED, PROP_WRITERS_CAN_INVITE, @@ -178,20 +176,6 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) entry_class->get_entry_uri = get_entry_uri; /** - * GDataDocumentsEntry:edited: - * - * The last time the document was edited. If the document has not been edited yet, the content indicates the time it was created. - * - * Since: 0.4.0 - * Deprecated: 0.17.0: This is identical to #GDataEntry:updated. - */ - g_object_class_install_property (gobject_class, PROP_EDITED, - g_param_spec_int64 ("edited", - "Edited", "The last time the document was edited.", - -1, G_MAXINT64, -1, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); - - /** * GDataDocumentsEntry:last-viewed: * * The last time the document was viewed. @@ -255,22 +239,6 @@ gdata_documents_entry_class_init (GDataDocumentsEntryClass *klass) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); /** - * GDataDocumentsEntry:document-id: - * - * The document ID of the document, which is different from its entry ID (GDataEntry:id). The - * <ulink type="http" url="https://developers.google.com/google-apps/documents-list/#terminology_used_in_this_guide">online GData - * Documentation</ulink> refers to these as “untyped resource IDs”. - * - * Since: 0.4.0 - * Deprecated: 0.11.0: This a substring of the #GDataDocumentsEntry:resource-id, which is more general and should be used instead. - */ - g_object_class_install_property (gobject_class, PROP_DOCUMENT_ID, - g_param_spec_string ("document-id", - "Document ID", "The document ID of the document.", - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); - - /** * GDataDocumentsEntry:last-modified-by: * * Indicates the author of the last modification. @@ -442,18 +410,12 @@ gdata_documents_entry_get_property (GObject *object, guint property_id, GValue * case PROP_RESOURCE_ID: g_value_set_string (value, priv->resource_id); break; - case PROP_DOCUMENT_ID: - g_value_set_string (value, gdata_entry_get_id (GDATA_ENTRY (object))); - break; case PROP_WRITERS_CAN_INVITE: g_value_set_boolean (value, priv->writers_can_invite); break; case PROP_IS_DELETED: g_value_set_boolean (value, priv->is_deleted); break; - case PROP_EDITED: - g_value_set_int64 (value, gdata_entry_get_updated (GDATA_ENTRY (object))); - break; case PROP_LAST_VIEWED: g_value_set_int64 (value, priv->last_viewed); break; @@ -1122,24 +1084,6 @@ get_entry_uri (const gchar *id) } /** - * gdata_documents_entry_get_edited: - * @self: a #GDataDocumentsEntry - * - * Gets the #GDataDocumentsEntry:edited property. If the property is unset, <code class="literal">-1</code> will be returned. - * - * Return value: the UNIX timestamp for the time the document was last edited, or <code class="literal">-1</code> - * - * Since: 0.4.0 - * Deprecated: 0.17.0: Use gdata_entry_get_updated() instead. See #GDataDocumentsEntry:edited. - */ -gint64 -gdata_documents_entry_get_edited (GDataDocumentsEntry *self) -{ - g_return_val_if_fail (GDATA_IS_DOCUMENTS_ENTRY (self), -1); - return gdata_entry_get_updated (GDATA_ENTRY (self)); -} - -/** * gdata_documents_entry_get_last_viewed: * @self: a #GDataDocumentsEntry * @@ -1226,26 +1170,6 @@ gdata_documents_entry_get_path (GDataDocumentsEntry *self) } /** - * gdata_documents_entry_get_document_id: - * @self: a #GDataDocumentsEntry - * - * Gets the #GDataDocumentsEntry:document-id property. The - * <ulink type="http" url="https://developers.google.com/google-apps/documents-list/#terminology_used_in_this_guide">online GData Documentation</ulink> - * refers to these as “untyped resource IDs”. - * - * Return value: the document's document ID - * - * Since: 0.4.0 - * Deprecated: 0.11.0: Use gdata_documents_entry_get_resource_id() instead. See #GDataDocumentsEntry:document-id. - */ -const gchar * -gdata_documents_entry_get_document_id (GDataDocumentsEntry *self ) -{ - g_return_val_if_fail (GDATA_IS_DOCUMENTS_ENTRY (self), NULL); - return gdata_entry_get_id (GDATA_ENTRY (self)); -} - -/** * gdata_documents_entry_get_resource_id: * @self: a #GDataDocumentsEntry * diff --git a/gdata/services/documents/gdata-documents-entry.h b/gdata/services/documents/gdata-documents-entry.h index 4dd0e591..6983f592 100644 --- a/gdata/services/documents/gdata-documents-entry.h +++ b/gdata/services/documents/gdata-documents-entry.h @@ -103,11 +103,6 @@ gchar *gdata_documents_entry_get_path (GDataDocumentsEntry *self) G_GNUC_WARN_UN const gchar *gdata_documents_entry_get_resource_id (GDataDocumentsEntry *self) G_GNUC_PURE; -#ifndef LIBGDATA_DISABLE_DEPRECATED -const gchar *gdata_documents_entry_get_document_id (GDataDocumentsEntry *self) G_GNUC_PURE G_GNUC_DEPRECATED_FOR(gdata_documents_entry_get_resource_id); -gint64 gdata_documents_entry_get_edited (GDataDocumentsEntry *self) G_GNUC_DEPRECATED_FOR(gdata_entry_get_updated); -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - gint64 gdata_documents_entry_get_last_viewed (GDataDocumentsEntry *self); void gdata_documents_entry_set_writers_can_invite (GDataDocumentsEntry *self, gboolean writers_can_invite); diff --git a/gdata/services/documents/gdata-documents-presentation.h b/gdata/services/documents/gdata-documents-presentation.h index 5ab4b65b..dd60f5ed 100644 --- a/gdata/services/documents/gdata-documents-presentation.h +++ b/gdata/services/documents/gdata-documents-presentation.h @@ -67,23 +67,6 @@ G_BEGIN_DECLS #define GDATA_DOCUMENTS_PRESENTATION_PPT "ppt" /** - * GDATA_DOCUMENTS_PRESENTATION_SWF: - * - * The export format for Adobe Flash (SWF) format. - * - * For more information, see the - * <ulink type="http" url="https://developers.google.com/google-apps/documents-list/#valid_formats_for_presentations"> - * GData protocol specification</ulink>. - * - * Since: 0.7.0 - * Deprecated: SWF export has been deprecated in the protocol due to low demand for it; PDF export (using %GDATA_DOCUMENTS_PRESENTATION_PDF) is - * recommended instead. (Since: 0.11.0.) - */ -#ifndef LIBGDATA_DISABLE_DEPRECATED -#define GDATA_DOCUMENTS_PRESENTATION_SWF "swf" -#endif /* !LIBGDATA_DISABLE_DEPRECATED */ - -/** * GDATA_DOCUMENTS_PRESENTATION_TXT: * * The export format for plain text format. diff --git a/gdata/symbol.map b/gdata/symbol.map index 53135d1a..e2b970a4 100644 --- a/gdata/symbol.map +++ b/gdata/symbol.map @@ -303,9 +303,7 @@ global: gdata_documents_drive_query_get_type; gdata_documents_drive_query_new; gdata_documents_entry_add_documents_property; - gdata_documents_entry_get_document_id; gdata_documents_entry_get_document_properties; - gdata_documents_entry_get_edited; gdata_documents_entry_get_file_size; gdata_documents_entry_get_last_modified_by; gdata_documents_entry_get_last_viewed; diff --git a/gdata/tests/documents.c b/gdata/tests/documents.c index 868ae095..6d4ef3e6 100644 --- a/gdata/tests/documents.c +++ b/gdata/tests/documents.c @@ -1682,9 +1682,6 @@ test_folder_parser_normal (void) g_free (path); /* Check dates. */ - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - g_assert_cmpuint (gdata_documents_entry_get_edited (GDATA_DOCUMENTS_ENTRY (folder)), ==, 1334394740); - G_GNUC_END_IGNORE_DEPRECATIONS g_assert_cmpuint (gdata_documents_entry_get_last_viewed (GDATA_DOCUMENTS_ENTRY (folder)), ==, -1); author = gdata_documents_entry_get_last_modified_by (GDATA_DOCUMENTS_ENTRY (folder)); |