summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-02 14:53:30 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-02 15:33:52 +0200
commitbbfa56452fb808df62e5eee5661051da49bdf455 (patch)
tree674cccd99ae0cab11facad0bf39acd5270274958
parent95e26a832aadff2a233fa1b811d9a96af11d5d67 (diff)
rename tpl_log_manager_search_new_async to tpl_log_manager_search_async
-rw-r--r--telepathy-logger/log-manager-internal.h2
-rw-r--r--telepathy-logger/log-manager.c16
-rw-r--r--telepathy-logger/log-manager.h4
3 files changed, 11 insertions, 11 deletions
diff --git a/telepathy-logger/log-manager-internal.h b/telepathy-logger/log-manager-internal.h
index 9ff12582b..d31a6be32 100644
--- a/telepathy-logger/log-manager-internal.h
+++ b/telepathy-logger/log-manager-internal.h
@@ -68,7 +68,7 @@ GList * _tpl_log_manager_search_in_identifier_chats_new (TplLogManager *manager,
gchar const *chat_id,
const gchar *text);
-GList * _tpl_log_manager_search_new (TplLogManager *manager,
+GList * _tpl_log_manager_search (TplLogManager *manager,
const gchar *text);
gboolean _tpl_log_manager_search_in_identifier_chats_new_finish (
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 2d8e5f4b4..32fdda17e 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -661,7 +661,7 @@ _tpl_log_manager_search_in_identifier_chats_new (TplLogManager *manager,
GList *
-_tpl_log_manager_search_new (TplLogManager *manager,
+_tpl_log_manager_search (TplLogManager *manager,
const gchar *text)
{
GList *l, *out = NULL;
@@ -1366,7 +1366,7 @@ _tpl_log_manager_search_in_identifier_chats_new_async (TplLogManager *manager,
}
gboolean
-tpl_log_manager_search_new_finish (TplLogManager *self,
+tpl_log_manager_search_finish (TplLogManager *self,
GAsyncResult *result,
GList **chats,
GError **error)
@@ -1376,7 +1376,7 @@ tpl_log_manager_search_new_finish (TplLogManager *self,
g_return_val_if_fail (TPL_IS_LOG_MANAGER (self), FALSE);
g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE);
g_return_val_if_fail (g_simple_async_result_is_valid (result,
- G_OBJECT (self), tpl_log_manager_search_new_async), FALSE);
+ G_OBJECT (self), tpl_log_manager_search_async), FALSE);
simple = G_SIMPLE_ASYNC_RESULT (result);
@@ -1401,7 +1401,7 @@ _search_new_async_result_free (gpointer data)
static void
-_search_new_async_thread (GSimpleAsyncResult *simple,
+_search_async_thread (GSimpleAsyncResult *simple,
GObject *object,
GCancellable *cancellable)
{
@@ -1412,7 +1412,7 @@ _search_new_async_thread (GSimpleAsyncResult *simple,
async_data = g_async_result_get_user_data (G_ASYNC_RESULT (simple));
chat_info = async_data->request;
- lst = _tpl_log_manager_search_new (async_data->manager,
+ lst = _tpl_log_manager_search (async_data->manager,
chat_info->search_text);
g_simple_async_result_set_op_res_gpointer (simple, lst,
@@ -1421,7 +1421,7 @@ _search_new_async_thread (GSimpleAsyncResult *simple,
void
-tpl_log_manager_search_new_async (TplLogManager *manager,
+tpl_log_manager_search_async (TplLogManager *manager,
const gchar *text,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -1446,8 +1446,8 @@ 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);
+ tpl_log_manager_search_async);
- g_simple_async_result_run_in_thread (simple, _search_new_async_thread, 0,
+ g_simple_async_result_run_in_thread (simple, _search_async_thread, 0,
NULL);
}
diff --git a/telepathy-logger/log-manager.h b/telepathy-logger/log-manager.h
index dff2ed3c0..b84ae1c02 100644
--- a/telepathy-logger/log-manager.h
+++ b/telepathy-logger/log-manager.h
@@ -116,12 +116,12 @@ gboolean tpl_log_manager_get_chats_finish (TplLogManager *self,
void tpl_log_manager_get_chats_async (TplLogManager *manager,
TpAccount *account, GAsyncReadyCallback callback, gpointer user_data);
-gboolean tpl_log_manager_search_new_finish (TplLogManager *self,
+gboolean tpl_log_manager_search_finish (TplLogManager *self,
GAsyncResult *result,
GList **chats,
GError **error);
-void tpl_log_manager_search_new_async (TplLogManager *manager,
+void tpl_log_manager_search_async (TplLogManager *manager,
const gchar *text, GAsyncReadyCallback callback, gpointer user_data);
void tpl_log_manager_search_free (GList *hits);