summaryrefslogtreecommitdiff
path: root/telepathy-logger/log-manager.c
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2013-01-16 14:47:30 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2013-01-16 14:50:47 +0000
commit2332f4c6c6445616672617b587addc7211d3e99a (patch)
tree7717c69e6454c3b11d987ede75116562b5e88a2a /telepathy-logger/log-manager.c
parent586e2c4b847e8c39a01b648ab24e4cbd44dae67d (diff)
downloadtelepathy-logger-2332f4c6c6445616672617b587addc7211d3e99a.tar.gz
Split legacy Empathy log reader into its own class
My commit eaefb26 introduced a regression: by assuming that any class that implements add_event is writable, logs were being written to the legacy Empathy location. By splitting the legacy location handling into a subclass, we can override add_event to un-implement it and make the subclass read-only, as well as removing special cases from the XML store itself. Thanks to Debarshi Ray for catching this!
Diffstat (limited to 'telepathy-logger/log-manager.c')
-rw-r--r--telepathy-logger/log-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index ede6d26..37ff1d4 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -38,6 +38,7 @@
#include <telepathy-logger/event.h>
#include <telepathy-logger/event-internal.h>
#include <telepathy-logger/log-store-internal.h>
+#include <telepathy-logger/log-store-empathy-internal.h>
#include <telepathy-logger/log-store-xml-internal.h>
#include <telepathy-logger/log-store-pidgin-internal.h>
#include <telepathy-logger/log-store-sqlite-internal.h>
@@ -280,8 +281,7 @@ tpl_log_manager_init (TplLogManager *self)
/* Load by default the Empathy's legacy 'past coversations' LogStore */
add_log_store (self,
- g_object_new (TPL_TYPE_LOG_STORE_XML,
- "empathy-legacy", TRUE,
+ g_object_new (TPL_TYPE_LOG_STORE_EMPATHY,
NULL));
add_log_store (self,