summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-28 14:06:10 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-28 14:14:26 +0200
commitac51cfaa44521bacdfb2c8daf5952b4576579b0d (patch)
tree88469c1cba6112ee2763797047d4a8d7c2dbeb20
parentac1e90143ed7bac237538e4750ae7a6ef9a4b354 (diff)
Don't cleanup stale log-ids when preparing text channels
This takes a while as it involves lot of SQL comments and slow down the dispatching of channels (fdo #28787). According documentation of this function that's just an optionnal optimisation so disabling it won't hurt. I opened fdo #28791 about remaning issues in this code.
-rw-r--r--telepathy-logger/channel-text.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index 82b18b2..05e359f 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -90,8 +90,10 @@ static void pendingproc_get_pending_messages (TplActionChain *ctx,
gpointer user_data);
static void pendingproc_prepare_tpl_channel (TplActionChain *ctx,
gpointer user_data);
+#if 0
static void pendingproc_cleanup_pending_messages_db (TplActionChain *ctx,
gpointer user_data);
+#endif
static void keepon_on_receiving_signal (TplEntryText *log,
TpContact *remote);
@@ -481,8 +483,10 @@ _tpl_channel_text_call_when_ready (TplChannelText *self,
_tpl_action_chain_append (actions, pendingproc_get_room_info, NULL);
_tpl_action_chain_append (actions, pendingproc_connect_message_signals, NULL);
_tpl_action_chain_append (actions, pendingproc_get_pending_messages, NULL);
+#if 0
_tpl_action_chain_append (actions, pendingproc_cleanup_pending_messages_db,
NULL);
+#endif
/* start the chain consuming */
_tpl_action_chain_continue (actions);
}
@@ -570,10 +574,12 @@ tpl_channel_text_clean_up_stale_tokens (TplChannelText *self,
* No _tpl_action_chain_terminate() is called if some fatal error occurs since
* it's not considered a crucial point for TplChannel preparation.
*/
+#if 0
static void
pendingproc_cleanup_pending_messages_db (TplActionChain *ctx,
gpointer user_data)
{
+ /* FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=28791 */
/* five days ago in seconds */
TplChannelText *self = _tpl_action_chain_get_object (ctx);
const time_t time_limit = _tpl_time_get_current () -
@@ -616,6 +622,7 @@ out:
_tpl_action_chain_continue (ctx);
}
+#endif
static void