properly name _finish functions

5 files changed, 24 insertions, 24 deletions

diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index 915aef4d7..ad8546a52 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -390,7 +390,7 @@ _get_messages_return (GObject *manager,
   GList *messages, *ptr;
   GError *error = NULL;
 
-  messages = tpl_log_manager_get_messages_for_date_async_finish (res, &error);
+  messages = tpl_log_manager_get_messages_for_date_finish (res, &error);
   if (error != NULL)
     {
       DEBUG ("Failed to get messages: %s", error->message);
@@ -474,7 +474,7 @@ _get_dates_return (GObject *manager,
   RecentMessagesContext *ctx = user_data;
   GError *error = NULL;
 
-  ctx->dates = tpl_log_manager_get_dates_async_finish (res, &error);
+  ctx->dates = tpl_log_manager_get_dates_finish (res, &error);
   if (ctx->dates == NULL)
     {
       DEBUG ("Failed to get dates: %s", error->message);
diff --git a/telepathy-logger/log-manager-priv.h b/telepathy-logger/log-manager-priv.h
index 09136bba5..bb16e181f 100644
--- a/telepathy-logger/log-manager-priv.h
+++ b/telepathy-logger/log-manager-priv.h
@@ -31,7 +31,7 @@
 gboolean _tpl_log_manager_add_message (TplLogManager *manager,
     TplLogEntry *message, GError **error);
 
-gboolean _tpl_log_manager_add_message_async_finish (GAsyncResult *result,
+gboolean _tpl_log_manager_add_message_finish (GAsyncResult *result,
     GError **error);
 
 void _tpl_log_manager_add_message_async (TplLogManager *manager,
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 5b3c534fa..f30b3b67c 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -778,7 +778,7 @@ _tpl_log_manager_async_operation_cb (GObject *source_object,
 
 /* Start of add_message async implementation */
 gboolean
-_tpl_log_manager_add_message_async_finish (GAsyncResult *result,
+_tpl_log_manager_add_message_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@@ -842,7 +842,7 @@ _tpl_log_manager_add_message_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      _tpl_log_manager_add_message_async_finish);
+      _tpl_log_manager_add_message_finish);
 
   g_simple_async_result_run_in_thread (simple, _add_message_async_thread, 0,
       NULL);
@@ -852,7 +852,7 @@ _tpl_log_manager_add_message_async (TplLogManager *manager,
 
 /* Start of get_dates async implementation */
 GList *
-tpl_log_manager_get_dates_async_finish (GAsyncResult *result,
+tpl_log_manager_get_dates_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -932,7 +932,7 @@ tpl_log_manager_get_dates_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_get_dates_async_finish);
+      tpl_log_manager_get_dates_finish);
 
   g_simple_async_result_run_in_thread (simple, _get_dates_async_thread, 0,
       NULL);
@@ -941,7 +941,7 @@ tpl_log_manager_get_dates_async (TplLogManager *manager,
 
 /* Start of get_messages_for_date async implementation */
 GList *
-tpl_log_manager_get_messages_for_date_async_finish (GAsyncResult *result,
+tpl_log_manager_get_messages_for_date_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -1029,7 +1029,7 @@ tpl_log_manager_get_messages_for_date_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_get_messages_for_date_async_finish);
+      tpl_log_manager_get_messages_for_date_finish);
 
   g_simple_async_result_run_in_thread (simple,
       _get_messages_for_date_async_thread, 0, NULL);
@@ -1039,7 +1039,7 @@ tpl_log_manager_get_messages_for_date_async (TplLogManager *manager,
 
 /* Start of get_filtered_messages async implementation */
 GList *
-tpl_log_manager_get_filtered_messages_async_finish (GAsyncResult *result,
+tpl_log_manager_get_filtered_messages_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -1132,7 +1132,7 @@ tpl_log_manager_get_filtered_messages_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_get_filtered_messages_async_finish);
+      tpl_log_manager_get_filtered_messages_finish);
 
   g_simple_async_result_run_in_thread (simple,
       _get_filtered_messages_async_thread, 0, NULL);
@@ -1142,7 +1142,7 @@ tpl_log_manager_get_filtered_messages_async (TplLogManager *manager,
 
 /* Start of get_chats async implementation */
 GList *
-tpl_log_manager_get_chats_async_finish (GAsyncResult *result,
+tpl_log_manager_get_chats_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -1212,7 +1212,7 @@ tpl_log_manager_get_chats_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_get_chats_async_finish);
+      tpl_log_manager_get_chats_finish);
 
   g_simple_async_result_run_in_thread (simple, _get_chats_async_thread, 0,
       NULL);
@@ -1221,7 +1221,7 @@ tpl_log_manager_get_chats_async (TplLogManager *manager,
 
 /* Start of tpl_log_manager_search_in_identifier_chats_new async implementation */
 GList *
-tpl_log_manager_search_in_identifier_chats_new_async_finish (
+tpl_log_manager_search_in_identifier_chats_new_finish (
     GAsyncResult *result,
     GError **error)
 {
@@ -1297,7 +1297,7 @@ tpl_log_manager_search_in_identifier_chats_new_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_search_in_identifier_chats_new_async_finish);
+      tpl_log_manager_search_in_identifier_chats_new_finish);
 
   g_simple_async_result_run_in_thread (simple,
       _search_in_identifier_chats_new_async_thread, 0, NULL);
@@ -1307,7 +1307,7 @@ tpl_log_manager_search_in_identifier_chats_new_async (TplLogManager *manager,
 
 /* Start of tpl_log_manager_search_new async implementation */
 GList *
-tpl_log_manager_search_new_async_finish (GAsyncResult *result,
+tpl_log_manager_search_new_finish (GAsyncResult *result,
     GError **error)
 {
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -1373,7 +1373,7 @@ tpl_log_manager_search_new_async (TplLogManager *manager,
 
   simple = g_simple_async_result_new (G_OBJECT (manager),
       _tpl_log_manager_async_operation_cb, async_data,
-      tpl_log_manager_search_new_async_finish);
+      tpl_log_manager_search_new_finish);
 
   g_simple_async_result_run_in_thread (simple, _search_new_async_thread, 0,
       NULL);
diff --git a/telepathy-logger/log-manager.h b/telepathy-logger/log-manager.h
index c4750638b..e84b4a6bc 100644
--- a/telepathy-logger/log-manager.h
+++ b/telepathy-logger/log-manager.h
@@ -85,7 +85,7 @@ gboolean tpl_log_manager_exists (TplLogManager *manager,
 GList *tpl_log_manager_get_dates (TplLogManager *manager,
     TpAccount *account, const gchar *chat_id, gboolean chatroom);
 
-GList *tpl_log_manager_get_dates_async_finish (GAsyncResult *result,
+GList *tpl_log_manager_get_dates_finish (GAsyncResult *result,
     GError **error);
 
 void tpl_log_manager_get_dates_async (TplLogManager *manager,
@@ -96,7 +96,7 @@ GList *tpl_log_manager_get_messages_for_date (TplLogManager *manager,
     TpAccount *account, const gchar *chat_id, gboolean chatroom,
     const gchar *date);
 
-GList *tpl_log_manager_get_messages_for_date_async_finish (GAsyncResult *result,
+GList *tpl_log_manager_get_messages_for_date_finish (GAsyncResult *result,
     GError **error);
 
 void tpl_log_manager_get_messages_for_date_async (TplLogManager *manager,
@@ -107,7 +107,7 @@ GList *tpl_log_manager_get_filtered_messages (TplLogManager *manager,
     TpAccount *account, const gchar *chat_id, gboolean chatroom,
     guint num_messages, TplLogMessageFilter filter, gpointer user_data);
 
-GList *tpl_log_manager_get_filtered_messages_async_finish (GAsyncResult *result,
+GList *tpl_log_manager_get_filtered_messages_finish (GAsyncResult *result,
     GError **error);
 
 void tpl_log_manager_get_filtered_messages_async (TplLogManager *manager,
@@ -117,7 +117,7 @@ void tpl_log_manager_get_filtered_messages_async (TplLogManager *manager,
 
 GList *tpl_log_manager_get_chats (TplLogManager *manager, TpAccount *account);
 
-GList *tpl_log_manager_get_chats_async_finish (GAsyncResult *result,
+GList *tpl_log_manager_get_chats_finish (GAsyncResult *result,
     GError **error);
 
 void tpl_log_manager_get_chats_async (TplLogManager *manager,
@@ -126,7 +126,7 @@ void tpl_log_manager_get_chats_async (TplLogManager *manager,
 GList *tpl_log_manager_search_in_identifier_chats_new (TplLogManager *manager,
     TpAccount *account, gchar const *chat_id, const gchar *text);
 
-GList *tpl_log_manager_search_in_identifier_chats_new_async_finish (
+GList *tpl_log_manager_search_in_identifier_chats_new_finish (
     GAsyncResult *result, GError **error);
 
 void tpl_log_manager_search_in_identifier_chats_new_async (TplLogManager *manager,
@@ -136,7 +136,7 @@ void tpl_log_manager_search_in_identifier_chats_new_async (TplLogManager *manage
 GList *tpl_log_manager_search_new (TplLogManager *manager,
     const gchar *text);
 
-GList *tpl_log_manager_search_new_async_finish (GAsyncResult *result,
+GList *tpl_log_manager_search_new_finish (GAsyncResult *result,
     GError **error);
 
 void tpl_log_manager_search_new_async (TplLogManager *manager,
diff --git a/tests/test-searches.c b/tests/test-searches.c
index 523aeb54b..698f1af9a 100644
--- a/tests/test-searches.c
+++ b/tests/test-searches.c
@@ -13,7 +13,7 @@ static GMainLoop *loop = NULL;
 static void
 got_dates_cb (GObject *obj, GAsyncResult *result, gpointer user_data)
 {
-  GList *ret = tpl_log_manager_get_dates_async_finish (result, NULL);
+  GList *ret = tpl_log_manager_get_dates_finish (result, NULL);
 
   for (; ret != NULL; ret = g_list_next (ret))
     {