Strip off unused search_in_identifier

6 files changed, 0 insertions, 238 deletions

diff --git a/telepathy-logger/log-manager-internal.h b/telepathy-logger/log-manager-internal.h
index e2170be..566d656 100644
--- a/telepathy-logger/log-manager-internal.h
+++ b/telepathy-logger/log-manager-internal.h
@@ -59,27 +59,6 @@ GList * _tpl_log_manager_get_entities (TplLogManager *manager,
 GList * _tpl_log_manager_search (TplLogManager *manager,
     const gchar *text);
 
-GList * _tpl_log_manager_search_in_identifier (TplLogManager *manager,
-    TpAccount *account,
-    gchar const *identifier,
-    TplEventSearchType type,
-    const gchar *text);
-
-void _tpl_log_manager_search_in_identifier_async (
-    TplLogManager *manager,
-    TpAccount *account,
-    gchar const *id,
-    TplEventSearchType type,
-    const gchar *text,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean _tpl_log_manager_search_in_identifier_finish (
-    TplLogManager *self,
-    GAsyncResult *result,
-    GList **hits,
-    GError **error);
-
 TplLogSearchHit * _tpl_log_manager_search_hit_new (TpAccount *account,
     const gchar *id,
     TplEventSearchType type,
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index fcdc81c..b2c3fe4 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -721,36 +721,6 @@ _tpl_log_manager_get_entities (TplLogManager *manager,
 
 
 GList *
-_tpl_log_manager_search_in_identifier (TplLogManager *manager,
-    TpAccount *account,
-    gchar const *identifier,
-    TplEventSearchType type,
-    const gchar *text)
-{
-  GList *l, *out = NULL;
-  TplLogManagerPriv *priv;
-
-  g_return_val_if_fail (TPL_IS_LOG_MANAGER (manager), NULL);
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-  g_return_val_if_fail (!TPL_STR_EMPTY (identifier), NULL);
-  g_return_val_if_fail (!TPL_STR_EMPTY (text), NULL);
-
-  priv = manager->priv;
-
-  for (l = priv->readable_stores; l != NULL; l = g_list_next (l))
-    {
-      TplLogStore *store = TPL_LOG_STORE (l->data);
-
-      out = g_list_concat (out,
-          _tpl_log_store_search_in_identifier
-          (store, account, identifier, type, text));
-    }
-
-  return out;
-}
-
-
-GList *
 _tpl_log_manager_search (TplLogManager *manager,
     const gchar *text)
 {
@@ -1322,93 +1292,6 @@ tpl_log_manager_get_entities_finish (TplLogManager *self,
 
 
 static void
-_search_in_identifier_async_thread (GSimpleAsyncResult *simple,
-    GObject *object,
-    GCancellable *cancellable)
-{
-  TplLogManagerAsyncData *async_data;
-  TplLogManagerEventInfo *event_info;
-  GList *lst;
-
-  async_data = g_async_result_get_user_data (G_ASYNC_RESULT (simple));
-  event_info = async_data->request;
-
-  lst = _tpl_log_manager_search_in_identifier (async_data->manager,
-      event_info->account, event_info->id, event_info->type,
-      event_info->search_text);
-
-  g_simple_async_result_set_op_res_gpointer (simple, lst,
-      (GDestroyNotify) tpl_log_manager_search_free);
-}
-
-
-void
-_tpl_log_manager_search_in_identifier_async (TplLogManager *manager,
-    TpAccount *account,
-    gchar const *identifier,
-    TplEventSearchType type,
-    const gchar *text,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  TplLogManagerEventInfo *event_info = tpl_log_manager_event_info_new ();
-  TplLogManagerAsyncData *async_data = tpl_log_manager_async_data_new ();
-  GSimpleAsyncResult *simple;
-
-  g_return_if_fail (TPL_IS_LOG_MANAGER (manager));
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-
-  event_info->account = g_object_ref (account);
-  event_info->id = g_strdup (identifier);
-  event_info->type = type;
-  event_info->search_text = g_strdup (text);
-
-  async_data->manager = g_object_ref (manager);
-  async_data->request = event_info;
-  async_data->request_free =
-    (TplLogManagerFreeFunc) tpl_log_manager_event_info_free;
-  async_data->cb = callback;
-  async_data->user_data = user_data;
-
-  simple = g_simple_async_result_new (G_OBJECT (manager),
-      _tpl_log_manager_async_operation_cb, async_data,
-      _tpl_log_manager_search_in_identifier_async);
-
-  g_simple_async_result_run_in_thread (simple,
-      _search_in_identifier_async_thread, 0, NULL);
-
-  g_object_unref (simple);
-}
-
-
-gboolean
-_tpl_log_manager_search_in_identifier_finish (TplLogManager *self,
-    GAsyncResult *result,
-    GList **hits,
-    GError **error)
-{
-  GSimpleAsyncResult *simple;
-
-  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_in_identifier_async),
-      FALSE);
-
-  simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  if (g_simple_async_result_propagate_error (simple, error))
-    return FALSE;
-
-  if (hits != NULL)
-    *hits = _take_list (g_simple_async_result_get_op_res_gpointer (simple));
-
-  return TRUE;
-}
-
-
-static void
 _search_async_thread (GSimpleAsyncResult *simple,
     GObject *object,
     GCancellable *cancellable)
diff --git a/telepathy-logger/log-store-internal.h b/telepathy-logger/log-store-internal.h
index 098eece..409e73c 100644
--- a/telepathy-logger/log-store-internal.h
+++ b/telepathy-logger/log-store-internal.h
@@ -74,9 +74,6 @@ typedef struct
       const gchar *id, TplEventSearchType type);
   GList * (*get_entities) (TplLogStore *self, TpAccount *account);
   GList * (*search_new) (TplLogStore *self, const gchar *text);
-  GList * (*search_in_identifier) (TplLogStore *self,
-      TpAccount *account, const gchar *identifier, TplEventSearchType type,
-      const gchar *text);
   GList * (*get_filtered_events) (TplLogStore *self, TpAccount *account,
       const gchar *id, TplEventSearchType type, guint num_events,
       TplLogEventFilter filter, gpointer user_data);
@@ -97,9 +94,6 @@ GList * _tpl_log_store_get_events_for_date (TplLogStore *self,
 GList * _tpl_log_store_get_recent_events (TplLogStore *self,
     TpAccount *account, const gchar *id, TplEventSearchType type);
 GList * _tpl_log_store_get_entities (TplLogStore *self, TpAccount *account);
-GList * _tpl_log_store_search_in_identifier (TplLogStore *self,
-    TpAccount *account, const gchar *identifier, TplEventSearchType type,
-    const gchar *text);
 GList * _tpl_log_store_search_new (TplLogStore *self, const gchar *text);
 GList * _tpl_log_store_get_filtered_events (TplLogStore *self,
     TpAccount *account, const gchar *id, TplEventSearchType type,
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index d6eb2a4..16c78c5 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -1180,38 +1180,6 @@ log_store_pidgin_get_filtered_events (TplLogStore *self,
 }
 
 
-static GList *
-log_store_pidgin_search_in_identifier (TplLogStore *store,
-    TpAccount *account,
-    const gchar *identifier,
-    TplEventSearchType type,
-    const gchar *text)
-{
-  TplLogStorePidgin *self = TPL_LOG_STORE_PIDGIN (store);
-  GList *files;
-  GList *retval;
-  gchar *dir;
-
-  g_return_val_if_fail (TPL_IS_LOG_STORE_PIDGIN (self), NULL);
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-  g_return_val_if_fail (!tp_str_empty (identifier), NULL);
-  g_return_val_if_fail (!tp_str_empty (text), NULL);
-
-  dir = log_store_pidgin_get_dir (store, account, identifier, type);
-
-  files = log_store_pidgin_get_all_files (store, dir);
-  DEBUG ("Found %d log files in total", g_list_length (files));
-
-  retval = _log_store_pidgin_search_in_files (self, text, files);
-
-  g_free (dir);
-  g_list_foreach (files, (GFunc) g_free, NULL);
-  g_list_free (files);
-
-  return retval;
-}
-
-
 static void
 log_store_iface_init (gpointer g_iface,
     gpointer iface_data)
@@ -1224,7 +1192,6 @@ log_store_iface_init (gpointer g_iface,
   iface->get_dates = log_store_pidgin_get_dates;
   iface->get_events_for_date = log_store_pidgin_get_events_for_date;
   iface->get_entities = log_store_pidgin_get_entities;
-  iface->search_in_identifier = log_store_pidgin_search_in_identifier;
   iface->search_new = log_store_pidgin_search_new;
   iface->get_filtered_events = log_store_pidgin_get_filtered_events;
 }
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 169c436..5b20470 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -1068,34 +1068,6 @@ fail:
 
 
 static GList *
-log_store_xml_search_in_identifier (TplLogStore *store,
-    TpAccount *account,
-    const gchar *identifier,
-    TplEventSearchType type,
-    const gchar *text)
-{
-  TplLogStoreXml *self = (TplLogStoreXml *) store;
-  GList *files;
-  gchar *dir;
-
-  g_return_val_if_fail (TPL_IS_LOG_STORE_XML (self), NULL);
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-  g_return_val_if_fail (!TPL_STR_EMPTY (identifier), NULL);
-  g_return_val_if_fail (!TPL_STR_EMPTY (text), NULL);
-
-  dir = log_store_xml_get_dir (self, account, identifier, type);
-
-  files = log_store_xml_get_all_files (self, dir);
-  DEBUG ("Found %d log files in total", g_list_length (files));
-
-  g_free (dir);
-
-  return _log_store_xml_search_in_files (self, text, files);
-}
-
-
-
-static GList *
 log_store_xml_search_new (TplLogStore *store,
     const gchar *text)
 {
@@ -1371,8 +1343,6 @@ log_store_iface_init (gpointer g_iface,
   iface->get_dates = log_store_xml_get_dates;
   iface->get_events_for_date = log_store_xml_get_events_for_date;
   iface->get_entities = log_store_xml_get_entities;
-  iface->search_in_identifier =
-    log_store_xml_search_in_identifier;
   iface->search_new = log_store_xml_search_new;
   iface->get_filtered_events = log_store_xml_get_filtered_events;
 }
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index ab5e1dd..a2b5c7e 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -263,37 +263,6 @@ _tpl_log_store_get_entities (TplLogStore *self,
 
 
 /**
- * _tpl_log_store_search_in_identifier:
- * @self: a TplLogStore
- * @account: a TpAccount
- * @id: a non-NULL identifier
- * @type: the event type
- * @text: a text to be searched among @id events
- *
- * Searches textual log entries related to @id and matching @text
- *
- * Returns: a GList of (TplLogSearchHit *), to be freed using something like
- * g_list_foreach (lst, tpl_log_manager_search_free, NULL);
- * g_list_free (lst);
- */
-GList *
-_tpl_log_store_search_in_identifier (TplLogStore *self,
-    TpAccount *account,
-    const gchar *id,
-    TplEventSearchType type,
-    const gchar *text)
-{
-  g_return_val_if_fail (TPL_IS_LOG_STORE (self), NULL);
-  if (TPL_LOG_STORE_GET_INTERFACE (self)->search_in_identifier ==
-      NULL)
-    return NULL;
-
-  return TPL_LOG_STORE_GET_INTERFACE (self)->search_in_identifier (self,
-      account, id, type, text);
-}
-
-
-/**
  * _tpl_log_store_search_new:
  * @self: a TplLogStore
  * @text: a text to be searched among text messages