From 2e1d7142fec9cba8ced62082ce7027dec473cd7a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 25 Jan 2013 14:47:47 -0500 Subject: [PATCH] Deprecate CLIENT_BACKEND_PROPERTY_OPENING. Clients don't need to care if they're fully opened anymore. --- addressbook/libedata-book/e-book-backend.c | 2 +- addressbook/libedata-book/e-book-backend.h | 21 +++++++++++--------- calendar/libedata-cal/e-cal-backend.c | 2 +- calendar/libedata-cal/e-cal-backend.h | 21 +++++++++++--------- .../libedata-book/libedata-book-sections.txt | 2 +- .../libedata-cal/libedata-cal-sections.txt | 2 +- .../libedataserver/libedataserver-sections.txt | 2 +- libedataserver/e-client.h | 23 ++++++++++++---------- 8 files changed, 42 insertions(+), 33 deletions(-) diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c index e8b177d..f65f999 100644 --- a/addressbook/libedata-book/e-book-backend.c +++ b/addressbook/libedata-book/e-book-backend.c @@ -80,7 +80,7 @@ book_backend_get_backend_property (EBookBackend *backend, if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_OPENED)) { e_data_book_respond_get_backend_property (book, opid, NULL, "TRUE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_OPENING)) { - e_data_book_respond_get_backend_property (book, opid, NULL, e_book_backend_is_opening (backend) ? "TRUE" : "FALSE"); + e_data_book_respond_get_backend_property (book, opid, NULL, "FALSE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_ONLINE)) { e_data_book_respond_get_backend_property (book, opid, NULL, e_backend_get_online (E_BACKEND (backend)) ? "TRUE" : "FALSE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_READONLY)) { diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h index 50956d0..e956a80 100644 --- a/addressbook/libedata-book/e-book-backend.h +++ b/addressbook/libedata-book/e-book-backend.h @@ -52,15 +52,6 @@ ((obj), E_TYPE_BOOK_BACKEND, EBookBackendClass)) /** - * CLIENT_BACKEND_PROPERTY_OPENING: - * - * FIXME: Document me. - * - * Since: 3.2 - **/ -#define CLIENT_BACKEND_PROPERTY_OPENING "opening" - -/** * CLIENT_BACKEND_PROPERTY_ONLINE: * * FIXME: Document me. @@ -336,6 +327,18 @@ void e_book_backend_respond_opened (EBookBackend *backend, #define CLIENT_BACKEND_PROPERTY_OPENED "opened" /** + * CLIENT_BACKEND_PROPERTY_OPENING: + * + * FIXME: Document me. + * + * Since: 3.2 + * + * Deprecated: 3.8: Clients don't need to care if they're fully opened + * anymore. This property will always return %FALSE. + **/ +#define CLIENT_BACKEND_PROPERTY_OPENING "opening" + +/** * BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS: * * Since: 3.2 diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c index 06d410f..abc5aae 100644 --- a/calendar/libedata-cal/e-cal-backend.c +++ b/calendar/libedata-cal/e-cal-backend.c @@ -146,7 +146,7 @@ cal_backend_get_backend_property (ECalBackend *backend, if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_OPENED)) { e_data_cal_respond_get_backend_property (cal, opid, NULL, "TRUE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_OPENING)) { - e_data_cal_respond_get_backend_property (cal, opid, NULL, e_cal_backend_is_opening (backend) ? "TRUE" : "FALSE"); + e_data_cal_respond_get_backend_property (cal, opid, NULL, "FALSE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_ONLINE)) { e_data_cal_respond_get_backend_property (cal, opid, NULL, e_backend_get_online (E_BACKEND (backend)) ? "TRUE" : "FALSE"); } else if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_READONLY)) { diff --git a/calendar/libedata-cal/e-cal-backend.h b/calendar/libedata-cal/e-cal-backend.h index 84c36d0..9072554 100644 --- a/calendar/libedata-cal/e-cal-backend.h +++ b/calendar/libedata-cal/e-cal-backend.h @@ -52,15 +52,6 @@ ((obj), E_TYPE_CAL_BACKEND, ECalBackendClass)) /** - * CLIENT_BACKEND_PROPERTY_OPENING: - * - * FIXME: Document me. - * - * Since: 3.2 - **/ -#define CLIENT_BACKEND_PROPERTY_OPENING "opening" - -/** * CLIENT_BACKEND_PROPERTY_ONLINE: * * FIXME: Document me. @@ -433,6 +424,18 @@ void e_cal_backend_respond_opened (ECalBackend *backend, **/ #define CLIENT_BACKEND_PROPERTY_OPENED "opened" +/** + * CLIENT_BACKEND_PROPERTY_OPENING: + * + * FIXME: Document me. + * + * Since: 3.2 + * + * Deprecated: 3.8: Clients don't need to care if they're fully opened + * anymore. This property will always return %FALSE. + **/ +#define CLIENT_BACKEND_PROPERTY_OPENING "opening" + void e_cal_backend_foreach_view (ECalBackend *backend, gboolean (*callback) (EDataCalView *view, gpointer user_data), diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt index 8d6e832..988b43e 100644 --- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt +++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt @@ -2,7 +2,6 @@ e-book-backend EBookBackend EBookBackend -CLIENT_BACKEND_PROPERTY_OPENING CLIENT_BACKEND_PROPERTY_ONLINE CLIENT_BACKEND_PROPERTY_READONLY CLIENT_BACKEND_PROPERTY_CACHE_DIR @@ -49,6 +48,7 @@ e_book_backend_set_is_removed e_book_backend_respond_opened CLIENT_BACKEND_PROPERTY_OPENED +CLIENT_BACKEND_PROPERTY_OPENING BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS e_book_backend_foreach_view diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt index dc568fe..47e5fb9 100644 --- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt +++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt @@ -2,7 +2,6 @@ e-cal-backend ECalBackend ECalBackend -CLIENT_BACKEND_PROPERTY_OPENING CLIENT_BACKEND_PROPERTY_ONLINE CLIENT_BACKEND_PROPERTY_READONLY CLIENT_BACKEND_PROPERTY_CACHE_DIR @@ -59,6 +58,7 @@ e_cal_backend_set_is_removed e_cal_backend_respond_opened CLIENT_BACKEND_PROPERTY_OPENED +CLIENT_BACKEND_PROPERTY_OPENING e_cal_backend_foreach_view E_CAL_BACKEND diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt index 5fd1dfc..77b3dff 100644 --- a/docs/reference/libedataserver/libedataserver-sections.txt +++ b/docs/reference/libedataserver/libedataserver-sections.txt @@ -42,7 +42,6 @@ E_CLIENT_ERROR EClientError e_client_error_to_string e_client_error_create -CLIENT_BACKEND_PROPERTY_OPENING CLIENT_BACKEND_PROPERTY_ONLINE CLIENT_BACKEND_PROPERTY_READONLY CLIENT_BACKEND_PROPERTY_CACHE_DIR @@ -78,6 +77,7 @@ EClientErrorsList e_client_util_unwrap_dbus_error CLIENT_BACKEND_PROPERTY_OPENED +CLIENT_BACKEND_PROPERTY_OPENING e_client_remove e_client_remove_finish e_client_remove_sync diff --git a/libedataserver/e-client.h b/libedataserver/e-client.h index cd00513..19f2bf0 100644 --- a/libedataserver/e-client.h +++ b/libedataserver/e-client.h @@ -50,16 +50,6 @@ ((obj), E_TYPE_CLIENT, EClientClass)) /** - * CLIENT_BACKEND_PROPERTY_OPENING: - * - * The "opening" property is "TRUE" when the client is in the process of - * opening, "FALSE" at all other times. - * - * Since: 3.2 - **/ -#define CLIENT_BACKEND_PROPERTY_OPENING "opening" - -/** * CLIENT_BACKEND_PROPERTY_ONLINE: * * The "online" property is "TRUE" when the client is fully opened and @@ -413,6 +403,19 @@ gboolean e_client_util_unwrap_dbus_error (GError *dbus_error, **/ #define CLIENT_BACKEND_PROPERTY_OPENED "opened" +/** + * CLIENT_BACKEND_PROPERTY_OPENING: + * + * The "opening" property is "TRUE" when the client is in the process of + * opening, "FALSE" at all other times. + * + * Since: 3.2 + * + * Deprecated: 3.8: Clients don't need to care if they're fully opened + * anymore. This property will always return %FALSE. + **/ +#define CLIENT_BACKEND_PROPERTY_OPENING "opening" + void e_client_remove (EClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, -- 2.7.4