telepathy-logger: TplLogStore: make :readable property immutable
Will Thompson
wjt at kemper.freedesktop.org
Thu Sep 27 10:29:00 PDT 2012
Module: telepathy-logger
Branch: master
Commit: 5379654f62829ee5cf3751e73d20ae737b750a19
URL: http://cgit.freedesktop.org/telepathy/telepathy-logger/commit/?id=5379654f62829ee5cf3751e73d20ae737b750a19
Author: Will Thompson <will.thompson at collabora.co.uk>
Date: Tue Sep 25 18:56:59 2012 -0400
TplLogStore: make :readable property immutable
Again, it's meaningless to have this be a writeable construct-only
property—a store is either readable or it's not.
---
telepathy-logger/log-manager.c | 12 +++++-------
telepathy-logger/log-store-pidgin.c | 17 +----------------
telepathy-logger/log-store-sqlite.c | 1 -
telepathy-logger/log-store-xml.c | 17 +----------------
telepathy-logger/log-store.c | 8 ++++----
tests/dbus/test-tpl-log-store-pidgin.c | 1 -
6 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 966e7fe..87ebb2a 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -189,8 +189,7 @@ tpl_log_manager_class_init (TplLogManagerClass *klass)
static TplLogStore *
add_log_store (TplLogManager *self,
GType type,
- const char *name,
- gboolean readable)
+ const char *name)
{
TplLogStore *store;
@@ -198,7 +197,6 @@ add_log_store (TplLogManager *self,
store = g_object_new (type,
"name", name,
- "readable", readable,
NULL);
/* set the log store in "testmode" if it supports it and the environment is
@@ -288,17 +286,17 @@ tpl_log_manager_init (TplLogManager *self)
G_CALLBACK (_globally_enabled_changed), NULL);
/* The TPL's default read-write logstore */
- add_log_store (self, TPL_TYPE_LOG_STORE_XML, "TpLogger", TRUE);
+ add_log_store (self, TPL_TYPE_LOG_STORE_XML, "TpLogger");
/* Load by default the Empathy's legacy 'past coversations' LogStore */
- store = add_log_store (self, TPL_TYPE_LOG_STORE_XML, "Empathy", TRUE);
+ store = add_log_store (self, TPL_TYPE_LOG_STORE_XML, "Empathy");
if (store != NULL)
g_object_set (store, "empathy-legacy", TRUE, NULL);
- add_log_store (self, TPL_TYPE_LOG_STORE_PIDGIN, "Pidgin", TRUE);
+ add_log_store (self, TPL_TYPE_LOG_STORE_PIDGIN, "Pidgin");
/* Load the event counting cache */
- add_log_store (self, TPL_TYPE_LOG_STORE_SQLITE, "Sqlite", FALSE);
+ add_log_store (self, TPL_TYPE_LOG_STORE_SQLITE, "Sqlite");
DEBUG ("Log Manager initialised");
}
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index c9c9772..fe289e9 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -48,7 +48,6 @@ struct _TplLogStorePidginPriv
gchar *basedir;
gchar *name;
- gboolean readable;
};
enum {
@@ -71,7 +70,6 @@ static void log_store_pidgin_set_name (TplLogStorePidgin *self, const gchar *dat
static const gchar *log_store_pidgin_get_basedir (TplLogStorePidgin *self);
static void log_store_pidgin_set_basedir (TplLogStorePidgin *self,
const gchar *data);
-static void log_store_pidgin_set_readable (TplLogStorePidgin *self, gboolean data);
G_DEFINE_TYPE_WITH_CODE (TplLogStorePidgin, tpl_log_store_pidgin,
@@ -92,7 +90,7 @@ tpl_log_store_pidgin_get_property (GObject *object,
g_value_set_string (value, priv->name);
break;
case PROP_READABLE:
- g_value_set_boolean (value, priv->readable);
+ g_value_set_boolean (value, TRUE);
break;
case PROP_BASEDIR:
g_value_set_string (value, priv->basedir);
@@ -120,9 +118,6 @@ tpl_log_store_pidgin_set_property (GObject *object,
case PROP_NAME:
log_store_pidgin_set_name (self, g_value_get_string (value));
break;
- case PROP_READABLE:
- log_store_pidgin_set_readable (self, g_value_get_boolean (value));
- break;
case PROP_BASEDIR:
log_store_pidgin_set_basedir (self, g_value_get_string (value));
break;
@@ -263,16 +258,6 @@ log_store_pidgin_set_basedir (TplLogStorePidgin *self,
}
-static void
-log_store_pidgin_set_readable (TplLogStorePidgin *self,
- gboolean data)
-{
- g_return_if_fail (TPL_IS_LOG_STORE_PIDGIN (self));
-
- self->priv->readable = data;
-}
-
-
/* internal: get the full name of the storing directory, including protocol
* and id */
static gchar *
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index bd4ed98..7418d45 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -128,7 +128,6 @@ tpl_log_store_sqlite_set_property (GObject *self,
switch (id)
{
case PROP_NAME:
- case PROP_READABLE:
break;
default:
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 0c4595e..17753ed 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -80,7 +80,6 @@ struct _TplLogStoreXmlPriv
{
gchar *basedir;
gchar *name;
- gboolean readable;
gboolean empathy_legacy;
gboolean test_mode;
TpAccountManager *account_manager;
@@ -105,7 +104,6 @@ static void log_store_xml_set_name (TplLogStoreXml *self, const gchar *data);
static const gchar *log_store_xml_get_basedir (TplLogStoreXml *self);
static void log_store_xml_set_basedir (TplLogStoreXml *self,
const gchar *data);
-static void log_store_xml_set_readable (TplLogStoreXml *self, gboolean data);
G_DEFINE_TYPE_WITH_CODE (TplLogStoreXml, _tpl_log_store_xml,
@@ -168,7 +166,7 @@ tpl_log_store_xml_get_property (GObject *object,
g_value_set_string (value, priv->name);
break;
case PROP_READABLE:
- g_value_set_boolean (value, priv->readable);
+ g_value_set_boolean (value, TRUE);
break;
case PROP_BASEDIR:
g_value_set_string (value, priv->basedir);
@@ -199,9 +197,6 @@ tpl_log_store_xml_set_property (GObject *object,
case PROP_NAME:
log_store_xml_set_name (self, g_value_get_string (value));
break;
- case PROP_READABLE:
- log_store_xml_set_readable (self, g_value_get_boolean (value));
- break;
case PROP_EMPATHY_LEGACY:
self->priv->empathy_legacy = g_value_get_boolean (value);
break;
@@ -1833,16 +1828,6 @@ log_store_xml_set_basedir (TplLogStoreXml *self,
}
-static void
-log_store_xml_set_readable (TplLogStoreXml *self,
- gboolean data)
-{
- g_return_if_fail (TPL_IS_LOG_STORE_XML (self));
-
- self->priv->readable = data;
-}
-
-
static GList *
log_store_xml_get_filtered_events (TplLogStore *store,
TpAccount *account,
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index c586bbb..5ad1536 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -79,16 +79,16 @@ _tpl_log_store_init (gpointer g_iface)
* Defines whether the object is readable for a #TplLogManager.
*
* If an TplLogStore implementation is readable, the #TplLogManager will
- * use the query methods against the instance (i.e. tpl_log_store_get_dates())
- * every time a #TplLogManager instance is queried (i.e.,
- * tpl_log_manager_get_date()).
+ * use the query methods against the instance (e.g. _tpl_log_store_get_dates())
+ * every time a #TplLogManager instance is queried (e.g.
+ * _tpl_log_manager_get_dates()).
*/
g_object_interface_install_property (g_iface,
g_param_spec_boolean ("readable",
"Readable",
"Whether this log store is readable",
TRUE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
const gchar *
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 9e94b9b..3ef0a23 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -253,7 +253,6 @@ test_basedir (PidginTestCaseFixture *fixture,
* match the real libpurple basedir */
store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
"name", "testcase",
- "readable", FALSE,
NULL);
dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
"logs", NULL);
More information about the telepathy-commits
mailing list