From 78db78bf8b648c32ced27231edb8708cea0a8900 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Feb 2013 07:53:32 -0500 Subject: [PATCH] Deprecate e_data_server_util_get/set_dbus_call_timeout(). No longer used. --- docs/reference/libedataserver/libedataserver-sections.txt | 4 ++-- libedataserver/e-data-server-util.c | 6 +++++- libedataserver/e-data-server-util.h | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt index fbf53c7..c9b8a46 100644 --- a/docs/reference/libedataserver/libedataserver-sections.txt +++ b/docs/reference/libedataserver/libedataserver-sections.txt @@ -1226,8 +1226,6 @@ e_util_get_prefix e_util_get_cp_prefix e_util_get_localedir e_util_replace_prefix -e_data_server_util_get_dbus_call_timeout -e_data_server_util_set_dbus_call_timeout ENamedParameters e_named_parameters_new e_named_parameters_new_strv @@ -1243,6 +1241,8 @@ e_util_free_string_slist e_util_free_object_slist e_util_copy_string_slist e_util_copy_object_slist +e_data_server_util_get_dbus_call_timeout +e_data_server_util_set_dbus_call_timeout e_named_parameters_get_type diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c index fc09af8..03f07d9 100644 --- a/libedataserver/e-data-server-util.c +++ b/libedataserver/e-data-server-util.c @@ -1666,7 +1666,7 @@ PUBLIC_GETTER (localedir) #endif /* G_OS_WIN32 */ -static gint default_dbus_timeout = DEFAULT_EDS_DBUS_TIMEOUT; +static gint default_dbus_timeout = -1; /** * e_data_server_util_set_dbus_call_timeout: @@ -1682,6 +1682,8 @@ static gint default_dbus_timeout = DEFAULT_EDS_DBUS_TIMEOUT; * and -1 is used when not set. * * Since: 3.0 + * + * Deprecated: 3.8: This value is not used anywhere. **/ void e_data_server_util_set_dbus_call_timeout (gint timeout_msec) @@ -1697,6 +1699,8 @@ e_data_server_util_set_dbus_call_timeout (gint timeout_msec) * Returns: the D-Bus call timeout in milliseconds * * Since: 3.0 + * + * Deprecated: 3.8: This value is not used anywhere. **/ gint e_data_server_util_get_dbus_call_timeout (void) diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h index 33d8132..cf8ce2d 100644 --- a/libedataserver/e-data-server-util.h +++ b/libedataserver/e-data-server-util.h @@ -126,11 +126,6 @@ gchar * e_util_replace_prefix (const gchar *configure_time_prefix, const gchar *configure_time_path); #endif -gint e_data_server_util_get_dbus_call_timeout - (void); -void e_data_server_util_set_dbus_call_timeout - (gint timeout_msec); - /* utility functions for easier processing of named parameters */ /** @@ -168,6 +163,11 @@ GSList * e_util_copy_string_slist (GSList *copy_to, const GSList *strings); GSList * e_util_copy_object_slist (GSList *copy_to, const GSList *objects); +gint e_data_server_util_get_dbus_call_timeout + (void); +void e_data_server_util_set_dbus_call_timeout + (gint timeout_msec); + #endif /* EDS_DISABLE_DEPRECATED */ G_END_DECLS -- 2.7.4