From 02f14e5ed7074d30825ab1810c75520bfb9ed65f Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:56:37 -0400
Subject: Correct some typos in docstrings

---
 telepathy-logger/log-store.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index f57645e..68f4836 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -76,11 +76,11 @@ _tpl_log_store_init (gpointer g_iface)
   /**
    * TplLogStore:writable:
    *
-   * Defines wether the object is writable for a #TplLogManager.
+   * Defines whether the object is writable for a #TplLogManager.
    *
    * If an TplLogStore implementation is writable, the #TplLogManager will call
-   * it's tpl_log_store_add_event() method every time a loggable even occurs,
-   * i.e., everytime _tpl_log_manager_add_event() is called.
+   * its tpl_log_store_add_event() method every time a loggable even occurs,
+   * i.e., every time _tpl_log_manager_add_event() is called.
    */
   g_object_interface_install_property (g_iface,
       g_param_spec_boolean ("readable",
@@ -92,7 +92,7 @@ _tpl_log_store_init (gpointer g_iface)
   /**
    * TplLogStore:readable:
    *
-   * Defines wether the object is readable for a #TplLogManager.
+   * 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())
-- 
cgit v1.2.3


From e79bf63afac074b24d7d1ba1c0b0f7bb4b042c8d Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:56:44 -0400
Subject: TplLogStore: attach doc comments to the right properties

:readable and :writable had their doc comments swapped.
---
 telepathy-logger/log-store.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index 68f4836..44ef326 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -74,13 +74,14 @@ _tpl_log_store_init (gpointer g_iface)
         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
   /**
-   * TplLogStore:writable:
+   * TplLogStore:readable:
    *
-   * Defines whether the object is writable for a #TplLogManager.
+   * Defines whether the object is readable for a #TplLogManager.
    *
-   * If an TplLogStore implementation is writable, the #TplLogManager will call
-   * its tpl_log_store_add_event() method every time a loggable even occurs,
-   * i.e., every time _tpl_log_manager_add_event() is called.
+   * 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()).
    */
   g_object_interface_install_property (g_iface,
       g_param_spec_boolean ("readable",
@@ -90,14 +91,13 @@ _tpl_log_store_init (gpointer g_iface)
         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
   /**
-   * TplLogStore:readable:
+   * TplLogStore:writable:
    *
-   * Defines whether the object is readable for a #TplLogManager.
+   * Defines whether the object is writable 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()).
+   * If an TplLogStore implementation is writable, the #TplLogManager will call
+   * its tpl_log_store_add_event() method every time a loggable even occurs,
+   * i.e., every time _tpl_log_manager_add_event() is called.
    */
   g_object_interface_install_property (g_iface,
       g_param_spec_boolean ("writable",
-- 
cgit v1.2.3


From 6e7a9e68a6259ea3deaf6f8125435d3c4f86baa3 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:56:58 -0400
Subject: TplLogStore: remove writable property.

This property was defined by the interface to be readwrite, but this
doesn't make any sense: if the object implements the add_event method,
then it is writable, and if not, it doesn't.
---
 telepathy-logger/log-manager.c         | 24 +++++++-----------------
 telepathy-logger/log-store-pidgin.c    | 20 --------------------
 telepathy-logger/log-store-sqlite.c    |  7 -------
 telepathy-logger/log-store-xml.c       | 20 --------------------
 telepathy-logger/log-store.c           | 29 ++++-------------------------
 tests/dbus/test-tpl-log-store-pidgin.c |  1 -
 6 files changed, 11 insertions(+), 90 deletions(-)

diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 642e3f9..966e7fe 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -190,8 +190,7 @@ static TplLogStore *
 add_log_store (TplLogManager *self,
     GType type,
     const char *name,
-    gboolean readable,
-    gboolean writable)
+    gboolean readable)
 {
   TplLogStore *store;
 
@@ -200,7 +199,6 @@ add_log_store (TplLogManager *self,
   store = g_object_new (type,
       "name", name,
       "readable", readable,
-      "writable", writable,
       NULL);
 
   /* set the log store in "testmode" if it supports it and the environment is
@@ -290,17 +288,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, TRUE);
+  add_log_store (self, TPL_TYPE_LOG_STORE_XML, "TpLogger", TRUE);
 
   /* Load by default the Empathy's legacy 'past coversations' LogStore */
-  store = add_log_store (self, TPL_TYPE_LOG_STORE_XML, "Empathy", TRUE, FALSE);
+  store = add_log_store (self, TPL_TYPE_LOG_STORE_XML, "Empathy", TRUE);
   if (store != NULL)
     g_object_set (store, "empathy-legacy", TRUE, NULL);
 
-  add_log_store (self, TPL_TYPE_LOG_STORE_PIDGIN, "Pidgin", TRUE, FALSE);
+  add_log_store (self, TPL_TYPE_LOG_STORE_PIDGIN, "Pidgin", TRUE);
 
   /* Load the event counting cache */
-  add_log_store (self, TPL_TYPE_LOG_STORE_SQLITE, "Sqlite", FALSE, TRUE);
+  add_log_store (self, TPL_TYPE_LOG_STORE_SQLITE, "Sqlite", FALSE);
 
   DEBUG ("Log Manager initialised");
 }
@@ -324,13 +322,8 @@ tpl_log_manager_dup_singleton (void)
  * @event: a TplEvent subclass's instance
  * @error: the memory location of GError, filled if an error occurs
  *
- * It stores @event, sending it to all the registered TplLogStore which have
- * TplLogStore:writable set to %TRUE.
- * Every TplLogManager is guaranteed to have at least a readable
- * and a writable TplLogStore regitered.
- *
- * It applies for any registered TplLogStore with #TplLogstore:writable property
- * %TRUE
+ * It stores @event, sending it to all the writable registered #TplLogStore objects.
+ * (Every TplLogManager is guaranteed to have at least one writable log store.)
  *
  * Returns: %TRUE if the event has been successfully added, otherwise %FALSE.
  */
@@ -394,9 +387,6 @@ _tpl_log_manager_add_event (TplLogManager *manager,
  * It registers @logstore into @manager, the log store has to be an
  * implementation of the TplLogStore interface.
  *
- * @logstore has to properly implement the add_event method if the
- * #TplLogStore:writable is set to %TRUE.
- *
  * @logstore has to properly implement all the search/query methods if the
  * TplLogStore:readable is set to %TRUE.
  */
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 169acd6..c9c9772 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -49,14 +49,12 @@ struct _TplLogStorePidginPriv
   gchar *basedir;
   gchar *name;
   gboolean readable;
-  gboolean writable;
 };
 
 enum {
     PROP_0,
     PROP_NAME,
     PROP_READABLE,
-    PROP_WRITABLE,
     PROP_BASEDIR,
     PROP_TESTMODE,
 };
@@ -73,7 +71,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_writable (TplLogStorePidgin *self, gboolean data);
 static void log_store_pidgin_set_readable (TplLogStorePidgin *self, gboolean data);
 
 
@@ -94,9 +91,6 @@ tpl_log_store_pidgin_get_property (GObject *object,
       case PROP_NAME:
         g_value_set_string (value, priv->name);
         break;
-      case PROP_WRITABLE:
-        g_value_set_boolean (value, priv->writable);
-        break;
       case PROP_READABLE:
         g_value_set_boolean (value, priv->readable);
         break;
@@ -129,9 +123,6 @@ tpl_log_store_pidgin_set_property (GObject *object,
       case PROP_READABLE:
         log_store_pidgin_set_readable (self, g_value_get_boolean (value));
         break;
-      case PROP_WRITABLE:
-        log_store_pidgin_set_writable (self, g_value_get_boolean (value));
-        break;
       case PROP_BASEDIR:
         log_store_pidgin_set_basedir (self, g_value_get_string (value));
         break;
@@ -172,7 +163,6 @@ tpl_log_store_pidgin_class_init (TplLogStorePidginClass *klass)
 
   g_object_class_override_property (object_class, PROP_NAME, "name");
   g_object_class_override_property (object_class, PROP_READABLE, "readable");
-  g_object_class_override_property (object_class, PROP_WRITABLE, "writable");
 
   /**
    * TplLogStorePidgin:basedir:
@@ -283,16 +273,6 @@ log_store_pidgin_set_readable (TplLogStorePidgin *self,
 }
 
 
-static void
-log_store_pidgin_set_writable (TplLogStorePidgin *self,
-    gboolean data)
-{
-  g_return_if_fail (TPL_IS_LOG_STORE_PIDGIN (self));
-
-  self->priv->writable = 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 1c0f11f..bd4ed98 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -51,7 +51,6 @@ enum /* properties */
   PROP_0,
   PROP_NAME,
   PROP_READABLE,
-  PROP_WRITABLE
 };
 
 struct _TplLogStoreSqlitePrivate
@@ -113,10 +112,6 @@ tpl_log_store_sqlite_get_property (GObject *self,
         g_value_set_boolean (value, FALSE);
         break;
 
-      case PROP_WRITABLE:
-        g_value_set_boolean (value, TRUE);
-        break;
-
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (self, id, pspec);
         break;
@@ -134,7 +129,6 @@ tpl_log_store_sqlite_set_property (GObject *self,
     {
       case PROP_NAME:
       case PROP_READABLE:
-      case PROP_WRITABLE:
         break;
 
       default:
@@ -325,7 +319,6 @@ _tpl_log_store_sqlite_class_init (TplLogStoreSqliteClass *klass)
 
   g_object_class_override_property (gobject_class, PROP_NAME, "name");
   g_object_class_override_property (gobject_class, PROP_READABLE, "readable");
-  g_object_class_override_property (gobject_class, PROP_WRITABLE, "writable");
 
   g_type_class_add_private (gobject_class, sizeof (TplLogStoreSqlitePrivate));
 }
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 83a39a3..0c4595e 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -81,7 +81,6 @@ struct _TplLogStoreXmlPriv
   gchar *basedir;
   gchar *name;
   gboolean readable;
-  gboolean writable;
   gboolean empathy_legacy;
   gboolean test_mode;
   TpAccountManager *account_manager;
@@ -91,7 +90,6 @@ enum {
     PROP_0,
     PROP_NAME,
     PROP_READABLE,
-    PROP_WRITABLE,
     PROP_BASEDIR,
     PROP_EMPATHY_LEGACY,
     PROP_TESTMODE
@@ -107,7 +105,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_writable (TplLogStoreXml *self, gboolean data);
 static void log_store_xml_set_readable (TplLogStoreXml *self, gboolean data);
 
 
@@ -170,9 +167,6 @@ tpl_log_store_xml_get_property (GObject *object,
       case PROP_NAME:
         g_value_set_string (value, priv->name);
         break;
-      case PROP_WRITABLE:
-        g_value_set_boolean (value, priv->writable);
-        break;
       case PROP_READABLE:
         g_value_set_boolean (value, priv->readable);
         break;
@@ -208,9 +202,6 @@ tpl_log_store_xml_set_property (GObject *object,
       case PROP_READABLE:
         log_store_xml_set_readable (self, g_value_get_boolean (value));
         break;
-      case PROP_WRITABLE:
-        log_store_xml_set_writable (self, g_value_get_boolean (value));
-        break;
       case PROP_EMPATHY_LEGACY:
         self->priv->empathy_legacy = g_value_get_boolean (value);
         break;
@@ -240,7 +231,6 @@ _tpl_log_store_xml_class_init (TplLogStoreXmlClass *klass)
 
   g_object_class_override_property (object_class, PROP_NAME, "name");
   g_object_class_override_property (object_class, PROP_READABLE, "readable");
-  g_object_class_override_property (object_class, PROP_WRITABLE, "writable");
 
   /**
    * TplLogStoreXml:basedir:
@@ -1853,16 +1843,6 @@ log_store_xml_set_readable (TplLogStoreXml *self,
 }
 
 
-static void
-log_store_xml_set_writable (TplLogStoreXml *self,
-    gboolean data)
-{
-  g_return_if_fail (TPL_IS_LOG_STORE_XML (self));
-
-  self->priv->writable = 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 44ef326..c586bbb 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -30,7 +30,7 @@
  * SECTION:log-store
  * @title: TplLogStore
  * @short_description: LogStore interface can register into #TplLogManager as
- * #TplLogStore:writable or #TplLogStore:readable log stores.
+ * readable and/or writable log stores.
  * @see_also: #text-event:#TplTextEvent and other subclasses when they'll exist
  *
  * The #TplLogStore defines all the public methods that a TPL Log Store has to
@@ -89,22 +89,6 @@ _tpl_log_store_init (gpointer g_iface)
         "Whether this log store is readable",
         TRUE,
         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
-
-  /**
-   * TplLogStore:writable:
-   *
-   * Defines whether the object is writable for a #TplLogManager.
-   *
-   * If an TplLogStore implementation is writable, the #TplLogManager will call
-   * its tpl_log_store_add_event() method every time a loggable even occurs,
-   * i.e., every time _tpl_log_manager_add_event() is called.
-   */
-  g_object_interface_install_property (g_iface,
-      g_param_spec_boolean ("writable",
-        "Writable",
-        "Whether this log store is writable",
-        TRUE,
-        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 }
 
 const gchar *
@@ -150,11 +134,12 @@ _tpl_log_store_add_event (TplLogStore *self,
 {
   g_return_val_if_fail (TPL_IS_LOG_STORE (self), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
   if (TPL_LOG_STORE_GET_INTERFACE (self)->add_event == NULL)
     {
       g_set_error (error, TPL_LOG_STORE_ERROR,
           TPL_LOG_STORE_ERROR_ADD_EVENT,
-          "%s: add_event not implemented, but writable set to TRUE : %s",
+          "%s: %s is not writable",
           G_STRFUNC, G_OBJECT_CLASS_NAME (self));
       return FALSE;
     }
@@ -380,15 +365,9 @@ _tpl_log_store_create_iter (TplLogStore *self,
 gboolean
 _tpl_log_store_is_writable (TplLogStore *self)
 {
-  gboolean writable;
-
   g_return_val_if_fail (TPL_IS_LOG_STORE (self), FALSE);
 
-  g_object_get (self,
-      "writable", &writable,
-      NULL);
-
-  return writable;
+  return (TPL_LOG_STORE_GET_INTERFACE (self)->add_event != NULL);
 }
 
 
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 7d54d5f..9e94b9b 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -254,7 +254,6 @@ test_basedir (PidginTestCaseFixture *fixture,
   store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
       "name", "testcase",
       "readable", FALSE,
-      "writable", FALSE,
       NULL);
   dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
       "logs", NULL);
-- 
cgit v1.2.3


From 5379654f62829ee5cf3751e73d20ae737b750a19 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:56:59 -0400
Subject: TplLogStore: make :readable property immutable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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);
-- 
cgit v1.2.3


From d2bb2390c8598183d23a06ecc99705e6b0a94dbb Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:57:00 -0400
Subject: LogManager: simplify checking for duplicate stores

---
 telepathy-logger/log-manager.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 87ebb2a..7a75f37 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -393,8 +393,8 @@ _tpl_log_manager_register_log_store (TplLogManager *self,
     TplLogStore *logstore)
 {
   TplLogManagerPriv *priv = self->priv;
+  const gchar *name = _tpl_log_store_get_name (logstore);
   GList *l;
-  gboolean found = FALSE;
 
   g_return_val_if_fail (TPL_IS_LOG_MANAGER (self), FALSE);
   g_return_val_if_fail (TPL_IS_LOG_STORE (logstore), FALSE);
@@ -403,19 +403,13 @@ _tpl_log_manager_register_log_store (TplLogManager *self,
   for (l = priv->stores; l != NULL; l = g_list_next (l))
     {
       TplLogStore *store = l->data;
-      const gchar *name = _tpl_log_store_get_name (logstore);
 
       if (!tp_strdiff (name, _tpl_log_store_get_name (store)))
         {
-          found = TRUE;
-          break;
+          DEBUG ("name=%s: already registered", name);
+          return FALSE;
         }
     }
-  if (found)
-    {
-      DEBUG ("name=%s: already registered", _tpl_log_store_get_name (logstore));
-      return FALSE;
-    }
 
   if (_tpl_log_store_is_readable (logstore))
     priv->readable_stores = g_list_prepend (priv->readable_stores, logstore);
-- 
cgit v1.2.3


From e897c6f8284dc4ce6f5329fbfc6b24ba643d3ecd Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:57:01 -0400
Subject: LogManager: rearrange creating log stores a little.

---
 telepathy-logger/log-manager.c | 51 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 7a75f37..f9cd608 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -186,18 +186,11 @@ tpl_log_manager_class_init (TplLogManagerClass *klass)
 }
 
 
-static TplLogStore *
+static void
 add_log_store (TplLogManager *self,
-    GType type,
-    const char *name)
+    TplLogStore *store)
 {
-  TplLogStore *store;
-
-  g_return_val_if_fail (g_type_is_a (type, TPL_TYPE_LOG_STORE), NULL);
-
-  store = g_object_new (type,
-      "name", name,
-      NULL);
+  g_return_if_fail (TPL_IS_LOG_STORE (store));
 
   /* set the log store in "testmode" if it supports it and the environment is
    * currently in test mode */
@@ -206,16 +199,12 @@ add_log_store (TplLogManager *self,
           "testmode", (g_getenv ("TPL_TEST_MODE") != NULL),
           NULL);
 
-  if (store == NULL)
-    CRITICAL ("Error creating %s (name=%s)", g_type_name (type), name);
-  else if (!_tpl_log_manager_register_log_store (self, store))
-    CRITICAL ("Failed to register store name=%s", name);
-
-  if (store != NULL)
-    /* drop the initial ref */
-    g_object_unref (store);
+  if (!_tpl_log_manager_register_log_store (self, store))
+    CRITICAL ("Failed to register store name=%s",
+        _tpl_log_store_get_name (store));
 
-  return store;
+  /* drop the initial ref */
+  g_object_unref (store);
 }
 
 
@@ -272,7 +261,6 @@ _list_of_date_free (gpointer data)
 static void
 tpl_log_manager_init (TplLogManager *self)
 {
-  TplLogStore *store;
   TplLogManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       TPL_TYPE_LOG_MANAGER, TplLogManagerPriv);
 
@@ -286,17 +274,28 @@ 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");
+  add_log_store (self,
+      g_object_new (TPL_TYPE_LOG_STORE_XML,
+          "name", "TpLogger",
+          NULL));
 
   /* Load by default the Empathy's legacy 'past coversations' LogStore */
-  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,
+      g_object_new (TPL_TYPE_LOG_STORE_XML,
+          "name", "Empathy",
+          "empathy-legacy", TRUE,
+          NULL));
 
-  add_log_store (self, TPL_TYPE_LOG_STORE_PIDGIN, "Pidgin");
+  add_log_store (self,
+      g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
+          "name", "Pidgin",
+          NULL));
 
   /* Load the event counting cache */
-  add_log_store (self, TPL_TYPE_LOG_STORE_SQLITE, "Sqlite");
+  add_log_store (self,
+      g_object_new (TPL_TYPE_LOG_STORE_SQLITE,
+          "name", "Sqlite",
+          NULL));
 
   DEBUG ("Log Manager initialised");
 }
-- 
cgit v1.2.3


From 02378b69d4057001f873875ea9c03bda516fc08d Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:57:01 -0400
Subject: Make TplLogStore:name immutable.

For all log stores except the Xml one, this is always set to the same
thing. For the Xml one, the name of the store depends entirely on the
value of empathy-legacy.
---
 telepathy-logger/log-manager.c         |  4 ----
 telepathy-logger/log-store-pidgin.c    | 26 ++++----------------------
 telepathy-logger/log-store-xml.c       | 29 ++++++-----------------------
 telepathy-logger/log-store.c           |  2 +-
 tests/dbus/test-tpl-log-iter-pidgin.c  |  1 -
 tests/dbus/test-tpl-log-iter-xml.c     |  1 -
 tests/dbus/test-tpl-log-store-pidgin.c |  9 +++------
 tests/dbus/test-tpl-log-store-xml.c    |  1 -
 8 files changed, 14 insertions(+), 59 deletions(-)

diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index f9cd608..f3f1795 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -276,25 +276,21 @@ tpl_log_manager_init (TplLogManager *self)
   /* The TPL's default read-write logstore */
   add_log_store (self,
       g_object_new (TPL_TYPE_LOG_STORE_XML,
-          "name", "TpLogger",
           NULL));
 
   /* Load by default the Empathy's legacy 'past coversations' LogStore */
   add_log_store (self,
       g_object_new (TPL_TYPE_LOG_STORE_XML,
-          "name", "Empathy",
           "empathy-legacy", TRUE,
           NULL));
 
   add_log_store (self,
       g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
-          "name", "Pidgin",
           NULL));
 
   /* Load the event counting cache */
   add_log_store (self,
       g_object_new (TPL_TYPE_LOG_STORE_SQLITE,
-          "name", "Sqlite",
           NULL));
 
   DEBUG ("Log Manager initialised");
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index fe289e9..40a58cf 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -39,6 +39,8 @@
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include "debug-internal.h"
 
+#define TPL_LOG_STORE_PIDGIN_NAME "Pidgin"
+
 #define TXT_LOG_FILENAME_SUFFIX ".txt"
 #define HTML_LOG_FILENAME_SUFFIX ".html"
 
@@ -47,7 +49,6 @@ struct _TplLogStorePidginPriv
   gboolean test_mode;
 
   gchar *basedir;
-  gchar *name;
 };
 
 enum {
@@ -66,7 +67,6 @@ static void tpl_log_store_pidgin_get_property (GObject *object, guint param_id,
 static void tpl_log_store_pidgin_set_property (GObject *object, guint param_id, const GValue *value,
     GParamSpec *pspec);
 static const gchar *log_store_pidgin_get_name (TplLogStore *store);
-static void log_store_pidgin_set_name (TplLogStorePidgin *self, const gchar *data);
 static const gchar *log_store_pidgin_get_basedir (TplLogStorePidgin *self);
 static void log_store_pidgin_set_basedir (TplLogStorePidgin *self,
     const gchar *data);
@@ -87,7 +87,7 @@ tpl_log_store_pidgin_get_property (GObject *object,
   switch (param_id)
     {
       case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value, TPL_LOG_STORE_PIDGIN_NAME);
         break;
       case PROP_READABLE:
         g_value_set_boolean (value, TRUE);
@@ -115,9 +115,6 @@ tpl_log_store_pidgin_set_property (GObject *object,
 
   switch (param_id)
     {
-      case PROP_NAME:
-        log_store_pidgin_set_name (self, g_value_get_string (value));
-        break;
       case PROP_BASEDIR:
         log_store_pidgin_set_basedir (self, g_value_get_string (value));
         break;
@@ -139,9 +136,6 @@ tpl_log_store_pidgin_dispose (GObject *self)
   g_free (priv->basedir);
   priv->basedir = NULL;
 
-  g_free (priv->name);
-  priv->name = NULL;
-
   G_OBJECT_CLASS (tpl_log_store_pidgin_parent_class)->dispose (self);
 }
 
@@ -198,7 +192,7 @@ log_store_pidgin_get_name (TplLogStore *store)
 
   g_return_val_if_fail (TPL_IS_LOG_STORE_PIDGIN (self), NULL);
 
-  return self->priv->name;
+  return TPL_LOG_STORE_PIDGIN_NAME;
 }
 
 
@@ -229,18 +223,6 @@ log_store_pidgin_get_basedir (TplLogStorePidgin *self)
 }
 
 
-static void
-log_store_pidgin_set_name (TplLogStorePidgin *self,
-    const gchar *data)
-{
-  g_return_if_fail (TPL_IS_LOG_STORE_PIDGIN (self));
-  g_return_if_fail (!TPL_STR_EMPTY (data));
-  g_return_if_fail (self->priv->name == NULL);
-
-  self->priv->name = g_strdup (data);
-}
-
-
 static void
 log_store_pidgin_set_basedir (TplLogStorePidgin *self,
     const gchar *data)
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 17753ed..6b35822 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -79,7 +79,6 @@
 struct _TplLogStoreXmlPriv
 {
   gchar *basedir;
-  gchar *name;
   gboolean empathy_legacy;
   gboolean test_mode;
   TpAccountManager *account_manager;
@@ -100,7 +99,6 @@ static void tpl_log_store_xml_get_property (GObject *object, guint param_id, GVa
 static void tpl_log_store_xml_set_property (GObject *object, guint param_id, const GValue *value,
     GParamSpec *pspec);
 static const gchar *log_store_xml_get_name (TplLogStore *store);
-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);
@@ -144,11 +142,6 @@ log_store_xml_finalize (GObject *object)
       g_free (priv->basedir);
       priv->basedir = NULL;
     }
-  if (priv->name != NULL)
-    {
-      g_free (priv->name);
-      priv->name = NULL;
-    }
 }
 
 
@@ -163,7 +156,8 @@ tpl_log_store_xml_get_property (GObject *object,
   switch (param_id)
     {
       case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value,
+            log_store_xml_get_name ((TplLogStore *) object));
         break;
       case PROP_READABLE:
         g_value_set_boolean (value, TRUE);
@@ -194,9 +188,6 @@ tpl_log_store_xml_set_property (GObject *object,
 
   switch (param_id)
     {
-      case PROP_NAME:
-        log_store_xml_set_name (self, g_value_get_string (value));
-        break;
       case PROP_EMPATHY_LEGACY:
         self->priv->empathy_legacy = g_value_get_boolean (value);
         break;
@@ -1761,7 +1752,10 @@ log_store_xml_get_name (TplLogStore *store)
 
   g_return_val_if_fail (TPL_IS_LOG_STORE_XML (self), NULL);
 
-  return self->priv->name;
+  if (self->priv->empathy_legacy)
+    return "Empathy";
+  else
+    return "TpLogger";
 }
 
 
@@ -1800,17 +1794,6 @@ log_store_xml_get_basedir (TplLogStoreXml *self)
 }
 
 
-static void
-log_store_xml_set_name (TplLogStoreXml *self,
-    const gchar *data)
-{
-  g_return_if_fail (TPL_IS_LOG_STORE_XML (self));
-  g_return_if_fail (!TPL_STR_EMPTY (data));
-  g_return_if_fail (self->priv->name == NULL);
-
-  self->priv->name = g_strdup (data);
-}
-
 static void
 log_store_xml_set_basedir (TplLogStoreXml *self,
     const gchar *data)
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index 5ad1536..4017447 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -71,7 +71,7 @@ _tpl_log_store_init (gpointer g_iface)
         "Name",
         "The TplLogStore implementation's name",
         NULL,
-        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
   /**
    * TplLogStore:readable:
diff --git a/tests/dbus/test-tpl-log-iter-pidgin.c b/tests/dbus/test-tpl-log-iter-pidgin.c
index c18a34b..e1a96dc 100644
--- a/tests/dbus/test-tpl-log-iter-pidgin.c
+++ b/tests/dbus/test-tpl-log-iter-pidgin.c
@@ -52,7 +52,6 @@ setup (PidginTestCaseFixture* fixture,
   g_assert (fixture->main_loop != NULL);
 
   fixture->store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
-      "name", "testcase",
       "testmode", TRUE,
       NULL);
 
diff --git a/tests/dbus/test-tpl-log-iter-xml.c b/tests/dbus/test-tpl-log-iter-xml.c
index 1d64c15..7b966f6 100644
--- a/tests/dbus/test-tpl-log-iter-xml.c
+++ b/tests/dbus/test-tpl-log-iter-xml.c
@@ -28,7 +28,6 @@ setup (XmlTestCaseFixture* fixture,
   GError *error = NULL;
 
   fixture->store = g_object_new (TPL_TYPE_LOG_STORE_XML,
-      "name", "testcase",
       "testmode", TRUE,
       NULL);
 
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index 3ef0a23..fea3daf 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -171,7 +171,6 @@ setup (PidginTestCaseFixture* fixture,
   DEBUG ("basedir is %s", fixture->basedir);
 
   fixture->store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
-      "name", "testcase",
       "testmode", TRUE,
       NULL);
 
@@ -251,9 +250,7 @@ test_basedir (PidginTestCaseFixture *fixture,
 
   /* try to instantiate the default store, without passing basedir, it has to
    * match the real libpurple basedir */
-  store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN,
-      "name", "testcase",
-      NULL);
+  store = g_object_new (TPL_TYPE_LOG_STORE_PIDGIN, NULL);
   dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".purple",
       "logs", NULL);
   g_assert_cmpstr (log_store_pidgin_get_basedir (store), ==, dir);
@@ -345,9 +342,9 @@ test_get_name (PidginTestCaseFixture *fixture,
 {
   const gchar *name;
 
-  name = log_store_pidgin_get_name (TPL_LOG_STORE (fixture->store));
+  name = _tpl_log_store_get_name (TPL_LOG_STORE (fixture->store));
 
-  g_assert_cmpstr (name, ==, "testcase");
+  g_assert_cmpstr (name, ==, "Pidgin");
 }
 
 static void
diff --git a/tests/dbus/test-tpl-log-store-xml.c b/tests/dbus/test-tpl-log-store-xml.c
index f35b4a7..6deceb9 100644
--- a/tests/dbus/test-tpl-log-store-xml.c
+++ b/tests/dbus/test-tpl-log-store-xml.c
@@ -48,7 +48,6 @@ setup (XmlTestCaseFixture* fixture,
     gconstpointer user_data)
 {
   fixture->store = g_object_new (TPL_TYPE_LOG_STORE_XML,
-      "name", "testcase",
       "testmode", TRUE,
       NULL);
 
-- 
cgit v1.2.3


From 2b4aa4d6796a32022039947102248a83539d8857 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:57:02 -0400
Subject: TplLogStore: remove :name property entirely.

Given that _tpl_log_store_get_name exists, there's really no reason to
have a property as well.
---
 telepathy-logger/log-store-pidgin.c |  5 -----
 telepathy-logger/log-store-sqlite.c | 25 -------------------------
 telepathy-logger/log-store-xml.c    |  6 ------
 telepathy-logger/log-store.c        |  7 -------
 4 files changed, 43 deletions(-)

diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 40a58cf..9c60a81 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -53,7 +53,6 @@ struct _TplLogStorePidginPriv
 
 enum {
     PROP_0,
-    PROP_NAME,
     PROP_READABLE,
     PROP_BASEDIR,
     PROP_TESTMODE,
@@ -86,9 +85,6 @@ tpl_log_store_pidgin_get_property (GObject *object,
 
   switch (param_id)
     {
-      case PROP_NAME:
-        g_value_set_string (value, TPL_LOG_STORE_PIDGIN_NAME);
-        break;
       case PROP_READABLE:
         g_value_set_boolean (value, TRUE);
         break;
@@ -150,7 +146,6 @@ tpl_log_store_pidgin_class_init (TplLogStorePidginClass *klass)
   object_class->set_property = tpl_log_store_pidgin_set_property;
   object_class->dispose = tpl_log_store_pidgin_dispose;
 
-  g_object_class_override_property (object_class, PROP_NAME, "name");
   g_object_class_override_property (object_class, PROP_READABLE, "readable");
 
   /**
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 7418d45..0cb74e3 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -49,7 +49,6 @@ G_DEFINE_TYPE_WITH_CODE (TplLogStoreSqlite, _tpl_log_store_sqlite,
 enum /* properties */
 {
   PROP_0,
-  PROP_NAME,
   PROP_READABLE,
 };
 
@@ -103,10 +102,6 @@ tpl_log_store_sqlite_get_property (GObject *self,
 {
   switch (id)
     {
-      case PROP_NAME:
-        g_value_set_string (value, TPL_LOG_STORE_SQLITE_NAME);
-        break;
-
       case PROP_READABLE:
         /* this store should never be queried by the LogManager */
         g_value_set_boolean (value, FALSE);
@@ -119,24 +114,6 @@ tpl_log_store_sqlite_get_property (GObject *self,
 }
 
 
-static void
-tpl_log_store_sqlite_set_property (GObject *self,
-    guint id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  switch (id)
-    {
-      case PROP_NAME:
-        break;
-
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (self, id, pspec);
-        break;
-    }
-}
-
-
 static void
 purge_pending_messages (TplLogStoreSqlitePrivate *priv,
     GTimeSpan delta,
@@ -313,10 +290,8 @@ _tpl_log_store_sqlite_class_init (TplLogStoreSqliteClass *klass)
 
   gobject_class->constructor = tpl_log_store_sqlite_constructor;
   gobject_class->get_property = tpl_log_store_sqlite_get_property;
-  gobject_class->set_property = tpl_log_store_sqlite_set_property;
   gobject_class->dispose = tpl_log_store_sqlite_dispose;
 
-  g_object_class_override_property (gobject_class, PROP_NAME, "name");
   g_object_class_override_property (gobject_class, PROP_READABLE, "readable");
 
   g_type_class_add_private (gobject_class, sizeof (TplLogStoreSqlitePrivate));
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 6b35822..a723964 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -86,7 +86,6 @@ struct _TplLogStoreXmlPriv
 
 enum {
     PROP_0,
-    PROP_NAME,
     PROP_READABLE,
     PROP_BASEDIR,
     PROP_EMPATHY_LEGACY,
@@ -155,10 +154,6 @@ tpl_log_store_xml_get_property (GObject *object,
 
   switch (param_id)
     {
-      case PROP_NAME:
-        g_value_set_string (value,
-            log_store_xml_get_name ((TplLogStore *) object));
-        break;
       case PROP_READABLE:
         g_value_set_boolean (value, TRUE);
         break;
@@ -215,7 +210,6 @@ _tpl_log_store_xml_class_init (TplLogStoreXmlClass *klass)
   object_class->get_property = tpl_log_store_xml_get_property;
   object_class->set_property = tpl_log_store_xml_set_property;
 
-  g_object_class_override_property (object_class, PROP_NAME, "name");
   g_object_class_override_property (object_class, PROP_READABLE, "readable");
 
   /**
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index 4017447..77a7fd6 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -66,13 +66,6 @@ _tpl_log_store_get_type (void)
 static void
 _tpl_log_store_init (gpointer g_iface)
 {
-  g_object_interface_install_property (g_iface,
-      g_param_spec_string ("name",
-        "Name",
-        "The TplLogStore implementation's name",
-        NULL,
-        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
-
   /**
    * TplLogStore:readable:
    *
-- 
cgit v1.2.3


From 6d4d216f4a54b70a2cb986be436ed0ffaf90efc8 Mon Sep 17 00:00:00 2001
From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 25 Sep 2012 18:57:04 -0400
Subject: Ignore cscope.out file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e0f2d86..48a9667 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 Makefile
 Makefile.in
 tags
+cscope.out
 
 # Autotools and other top-level cruft
 /ChangeLog
-- 
cgit v1.2.3