From 3e464e731812816347321ecc91f1eb05dea269b3 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Fri, 15 Jan 2016 14:37:11 +0100 Subject: [PATCH] Rename modify_pusher update_pusher It reflects the functionality better. --- docs/reference/matrix-glib/matrix-glib-sections.txt | 2 +- src/matrix-api.c | 11 ++++++----- src/matrix-api.h | 4 ++-- src/matrix-http-api.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/reference/matrix-glib/matrix-glib-sections.txt b/docs/reference/matrix-glib/matrix-glib-sections.txt index 22ca57c..06c3444 100644 --- a/docs/reference/matrix-glib/matrix-glib-sections.txt +++ b/docs/reference/matrix-glib/matrix-glib-sections.txt @@ -212,7 +212,7 @@ matrix_api_get_user_presence matrix_api_set_user_presence -matrix_api_modify_pusher +matrix_api_update_pusher matrix_api_get_pushers matrix_api_delete_pusher matrix_api_get_pusher diff --git a/src/matrix-api.c b/src/matrix-api.c index 9799e7b..f8ebc93 100644 --- a/src/matrix-api.c +++ b/src/matrix-api.c @@ -49,7 +49,7 @@ * @update_presence_list: virtual function for matrix_api_update_presence_list() * @get_user_presence: virtual function for matrix_api_get_user_presence() * @set_user_presence: virtual function for matrix_api_set_user_presence() - * @modify_pusher: virtual function for matrix_api_modify_pusher() + * @update_pusher: virtual function for matrix_api_update_pusher() * @get_pushers: virtual function for matrix_api_get_pushers() * @delete_pusher: virtual function for matrix_api_delete_pusher() * @get_pusher: virtual function for matrix_api_get_pusher() @@ -532,7 +532,7 @@ matrix_api_set_user_presence(MatrixAPI *api, /* Push notifications */ /** - * matrix_api_modify_pusher: + * matrix_api_update_pusher: * @api: a #MatrixAPI implementation * @callback: (scope async) (allow-none): a function to call when the * request is finished @@ -541,10 +541,11 @@ matrix_api_set_user_presence(MatrixAPI *api, * @pusher: the pusher information * @error: return location for a #GError, or %NULL * - * Modify a pushers for the active user on this homeserver. + * Create, update or delete a pusher for the active user on this + * homeserver. */ void -matrix_api_modify_pusher(MatrixAPI *api, +matrix_api_update_pusher(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, MatrixAPIPusher *pusher, @@ -553,7 +554,7 @@ matrix_api_modify_pusher(MatrixAPI *api, g_return_if_fail(MATRIX_IS_API(api)); MATRIX_API_GET_IFACE(api) - ->modify_pusher(api, + ->update_pusher(api, callback, user_data, pusher, error); } diff --git a/src/matrix-api.h b/src/matrix-api.h index a40c11c..5036529 100644 --- a/src/matrix-api.h +++ b/src/matrix-api.h @@ -112,7 +112,7 @@ struct _MatrixAPIInterface { GError **error); /* Push notifications */ - void (*modify_pusher)(MatrixAPI *api, + void (*update_pusher)(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, MatrixAPIPusher *pusher, @@ -529,7 +529,7 @@ void matrix_api_set_user_presence(MatrixAPI *api, GError **error); /* Push notifications */ -void matrix_api_modify_pusher(MatrixAPI *api, +void matrix_api_update_pusher(MatrixAPI *api, MatrixAPICallback callback, gpointer user_data, MatrixAPIPusher *pusher, diff --git a/src/matrix-http-api.c b/src/matrix-http-api.c index 3c44c35..38f4d3e 100644 --- a/src/matrix-http-api.c +++ b/src/matrix-http-api.c @@ -1353,7 +1353,7 @@ matrix_http_api_matrix_api_init(MatrixAPIInterface *iface) iface->set_user_presence = i_set_user_presence; /* Push notifications */ - iface->modify_pusher = NULL; + iface->update_pusher = NULL; iface->get_pushers = NULL; iface->delete_pusher = NULL; iface->get_pusher = NULL;