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(-)

(limited to 'telepathy-logger')

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.1