diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-02-07 05:47:46 -0500 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-02-07 05:47:46 -0500 |
| commit | 2dea2ec166c3212c3f2474046c362874e6e2ca03 (patch) | |
| tree | 9666611264fbe4664fbf6d4df4e161bdb8200959 | |
| parent | 60c548bb2746f4f3357d9de64592647bc4712511 (diff) | |
| download | pidgin-2dea2ec166c3212c3f2474046c362874e6e2ca03.tar.gz | |
Mark deprecated functions with G_DEPRECATED_FOR.
| -rw-r--r-- | ChangeLog.API | 5 | ||||
| -rw-r--r-- | libpurple/util.c | 6 | ||||
| -rw-r--r-- | libpurple/util.h | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog.API b/ChangeLog.API index f3a0f5034f..4690a66d52 100644 --- a/ChangeLog.API +++ b/ChangeLog.API @@ -535,6 +535,11 @@ version 3.0.0 (??/??/????): * xmlnode_set_attrib_with_namespace * xmlnode_set_attrib_with_prefix + Deprecated: + * purple_user_dir + * purple_util_write_data_to_file + * purple_util_read_xml_from_file + Pidgin: Added: * pidgin_create_webview diff --git a/libpurple/util.c b/libpurple/util.c index 99addb464f..d60ca6e2a8 100644 --- a/libpurple/util.c +++ b/libpurple/util.c @@ -2948,7 +2948,9 @@ purple_move_to_xdg_base_dir(const char *purple_xdg_dir, char *path) gchar *old_path; gboolean old_path_exists; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS old_path = g_build_filename(purple_user_dir(), path, NULL); +G_GNUC_END_IGNORE_DEPRECATIONS old_path_exists = g_file_test(old_path, G_FILE_TEST_EXISTS); if (old_path_exists) { int rename_res; @@ -3020,7 +3022,9 @@ purple_util_write_data_to_file_common(const char *dir, const char *filename, con gboolean purple_util_write_data_to_file(const char *filename, const char *data, gssize size) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS const char *user_dir = purple_user_dir(); +G_GNUC_END_IGNORE_DEPRECATIONS gboolean ret = purple_util_write_data_to_file_common(user_dir, filename, data, size); return ret; @@ -3083,7 +3087,9 @@ purple_util_write_data_to_file_absolute(const char *filename_full, const char *d PurpleXmlNode * purple_util_read_xml_from_file(const char *filename, const char *description) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS return purple_xmlnode_from_file(purple_user_dir(), filename, description, "util"); +G_GNUC_END_IGNORE_DEPRECATIONS } PurpleXmlNode * diff --git a/libpurple/util.h b/libpurple/util.h index 884382cb34..20c1da0654 100644 --- a/libpurple/util.h +++ b/libpurple/util.h @@ -752,6 +752,7 @@ const gchar *purple_home_dir(void); * Deprecated: Use purple_cache_dir(), purple_config_dir() or * purple_data_dir() instead. */ +G_DEPRECATED_FOR(purple_cache_dir' or 'purple_config_dir' or 'purple_data_dir) const char *purple_user_dir(void); /** @@ -845,6 +846,7 @@ int purple_build_dir(const char *path, int mode); * purple_util_write_data_to_config_file() or * purple_util_write_data_to_data_file() instead. */ +G_DEPRECATED_FOR(purple_util_write_data_to_cache_file' or 'purple_util_write_data_to_config_file' or 'purple_util_write_data_to_data_file) gboolean purple_util_write_data_to_file(const char *filename, const char *data, gssize size); @@ -938,6 +940,7 @@ purple_util_write_data_to_file_absolute(const char *filename_full, const char *d * purple_util_read_xml_from_config_file() or * purple_util_read_xml_from_data_file() instead. */ +G_DEPRECATED_FOR(purple_util_read_xml_from_cache_file' or 'purple_util_read_xml_from_config_file' or 'purple_util_read_xml_from_data_file) PurpleXmlNode *purple_util_read_xml_from_file(const char *filename, const char *description); |