Make name property read only

since it doesn't need to be set. This allows us to kill some code

5 files changed, 15 insertions, 119 deletions

diff --git a/src/lpf-provider.c b/src/lpf-provider.c
index e2b8de6..6f7802b 100644
--- a/src/lpf-provider.c
+++ b/src/lpf-provider.c
@@ -165,7 +165,7 @@ lpf_provider_default_init (LpfProviderInterface *iface)
                                      "Name",
                                      "Provider Name",
                                      NULL,
-                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 }
 
 
diff --git a/src/providers/ch-sbb.c b/src/providers/ch-sbb.c
index 5433234..e29405d 100644
--- a/src/providers/ch-sbb.c
+++ b/src/providers/ch-sbb.c
@@ -47,24 +47,14 @@ static void lpf_provider_ch_sbb_interface_init (LpfProviderInterface *iface);
 G_DEFINE_TYPE_WITH_CODE (LpfProviderChSbb, lpf_provider_ch_sbb, LPF_TYPE_PROVIDER_HAFAS_BIN6,
                          G_IMPLEMENT_INTERFACE (LPF_TYPE_PROVIDER, lpf_provider_ch_sbb_interface_init));
 
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), LPF_TYPE_PROVIDER_CH_SBB, LpfProviderChSbbPrivate))
-
 int lpf_provider_major_version = LPF_PROVIDER_MAJOR_VERSION;
 int lpf_provider_minor_version = LPF_PROVIDER_MINOR_VERSION;
 
-typedef struct _LpfProviderChSbbPrivate LpfProviderChSbbPrivate;
-struct _LpfProviderChSbbPrivate {
-    gchar *name;
-};
-
 
 static const char*
 lpf_provider_ch_sbb_get_name (LpfProvider *self)
 {
-    LpfProviderChSbbPrivate *priv = GET_PRIVATE (self);
-
-    return priv->name;
+    return PROVIDER_NAME;
 }
 
 
@@ -93,12 +83,9 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-    LpfProviderChSbbPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        /* construct only */
-        priv->name = g_value_dup_string (value);
+        g_warn_if_reached ();
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -111,11 +98,9 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-    LpfProviderChSbbPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value, PROVIDER_NAME);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -125,26 +110,13 @@ get_property (GObject *object, guint prop_id,
 
 
 static void
-lpf_provider_ch_sbb_finalize (GObject *self)
-{
-    LpfProviderChSbbPrivate *priv = GET_PRIVATE(self);
-
-    g_free (priv->name);
-    G_OBJECT_CLASS (lpf_provider_ch_sbb_parent_class)->finalize (self);
-}
-
-
-static void
 lpf_provider_ch_sbb_class_init (LpfProviderChSbbClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     LpfProviderHafasBin6Class *hafas_class = LPF_PROVIDER_HAFAS_BIN6_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LpfProviderChSbbPrivate));
-
     object_class->get_property = get_property;
     object_class->set_property = set_property;
-    object_class->finalize = lpf_provider_ch_sbb_finalize;
 
     /* LpfProvider */
     g_object_class_override_property (object_class,
@@ -170,6 +142,5 @@ lpf_provider_ch_sbb_init (LpfProviderChSbb *self)
 LpfProviderChSbb *
 lpf_provider_ch_sbb_new (void)
 {
-    return g_object_new (LPF_TYPE_PROVIDER_CH_SBB, LPF_PROVIDER_PROP_NAME,
-                         PROVIDER_NAME, NULL);
+    return g_object_new (LPF_TYPE_PROVIDER_CH_SBB, NULL);
 }
diff --git a/src/providers/de-bvg.c b/src/providers/de-bvg.c
index 8094044..0b33834 100644
--- a/src/providers/de-bvg.c
+++ b/src/providers/de-bvg.c
@@ -47,24 +47,14 @@ static void lpf_provider_de_bvg_interface_init (LpfProviderInterface *iface);
 G_DEFINE_TYPE_WITH_CODE (LpfProviderDeBvg, lpf_provider_de_bvg, LPF_TYPE_PROVIDER_HAFAS_BIN6,
                          G_IMPLEMENT_INTERFACE (LPF_TYPE_PROVIDER, lpf_provider_de_bvg_interface_init));
 
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), LPF_TYPE_PROVIDER_DE_BVG, LpfProviderDeBvgPrivate))
-
 int lpf_provider_major_version = LPF_PROVIDER_MAJOR_VERSION;
 int lpf_provider_minor_version = LPF_PROVIDER_MINOR_VERSION;
 
-typedef struct _LpfProviderDeBvgPrivate LpfProviderDeBvgPrivate;
-struct _LpfProviderDeBvgPrivate {
-    gchar *name;
-};
-
 
 static const char*
 lpf_provider_de_bvg_get_name (LpfProvider *self)
 {
-    LpfProviderDeBvgPrivate *priv = GET_PRIVATE (self);
-
-    return priv->name;
+    return PROVIDER_NAME;
 }
 
 
@@ -93,12 +83,9 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-    LpfProviderDeBvgPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        /* construct only */
-        priv->name = g_value_dup_string (value);
+        g_warn_if_reached ();
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -111,11 +98,9 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-    LpfProviderDeBvgPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value, PROVIDER_NAME);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -125,26 +110,13 @@ get_property (GObject *object, guint prop_id,
 
 
 static void
-lpf_provider_de_bvg_finalize (GObject *self)
-{
-    LpfProviderDeBvgPrivate *priv = GET_PRIVATE(self);
-
-    g_free (priv->name);
-    G_OBJECT_CLASS (lpf_provider_de_bvg_parent_class)->finalize (self);
-}
-
-
-static void
 lpf_provider_de_bvg_class_init (LpfProviderDeBvgClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     LpfProviderHafasBin6Class *hafas_class = LPF_PROVIDER_HAFAS_BIN6_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LpfProviderDeBvgPrivate));
-
     object_class->get_property = get_property;
     object_class->set_property = set_property;
-    object_class->finalize = lpf_provider_de_bvg_finalize;
 
     /* LpfProvider */
     g_object_class_override_property (object_class,
@@ -170,6 +142,5 @@ lpf_provider_de_bvg_init (LpfProviderDeBvg *self)
 LpfProviderDeBvg *
 lpf_provider_de_bvg_new (void)
 {
-    return g_object_new (LPF_TYPE_PROVIDER_DE_BVG, LPF_PROVIDER_PROP_NAME,
-                         PROVIDER_NAME, NULL);
+    return g_object_new (LPF_TYPE_PROVIDER_DE_BVG, NULL);
 }
diff --git a/src/providers/de-db.c b/src/providers/de-db.c
index 76ceadd..f9051fd 100644
--- a/src/providers/de-db.c
+++ b/src/providers/de-db.c
@@ -44,24 +44,14 @@ static void lpf_provider_de_db_interface_init (LpfProviderInterface *iface);
 G_DEFINE_TYPE_WITH_CODE (LpfProviderDeDb, lpf_provider_de_db, LPF_TYPE_PROVIDER_HAFAS_BIN6,
                          G_IMPLEMENT_INTERFACE (LPF_TYPE_PROVIDER, lpf_provider_de_db_interface_init));
 
-#define GET_PRIVATE(o) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), LPF_TYPE_PROVIDER_DE_DB, LpfProviderDeDbPrivate))
-
 int lpf_provider_major_version = LPF_PROVIDER_MAJOR_VERSION;
 int lpf_provider_minor_version = LPF_PROVIDER_MINOR_VERSION;
 
-typedef struct _LpfProviderDeDbPrivate LpfProviderDeDbPrivate;
-struct _LpfProviderDeDbPrivate {
-    gchar *name;
-};
-
 
 static const char*
 lpf_provider_de_db_get_name (LpfProvider *self)
 {
-    LpfProviderDeDbPrivate *priv = GET_PRIVATE (self);
-
-    return priv->name;
+    return PROVIDER_NAME;
 }
 
 
@@ -90,12 +80,9 @@ static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
 {
-    LpfProviderDeDbPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        /* construct only */
-        priv->name = g_value_dup_string (value);
+        g_warn_if_reached ();
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -108,11 +95,9 @@ static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
 {
-    LpfProviderDeDbPrivate *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value, PROVIDER_NAME);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -122,26 +107,13 @@ get_property (GObject *object, guint prop_id,
 
 
 static void
-lpf_provider_de_db_finalize (GObject *self)
-{
-    LpfProviderDeDbPrivate *priv = GET_PRIVATE(self);
-
-    g_free (priv->name);
-    G_OBJECT_CLASS (lpf_provider_de_db_parent_class)->finalize (self);
-}
-
-
-static void
 lpf_provider_de_db_class_init (LpfProviderDeDbClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     LpfProviderHafasBin6Class *hafas_class = LPF_PROVIDER_HAFAS_BIN6_CLASS (klass);
 
-    g_type_class_add_private (klass, sizeof (LpfProviderDeDbPrivate));
-
     object_class->get_property = get_property;
     object_class->set_property = set_property;
-    object_class->finalize = lpf_provider_de_db_finalize;
 
     /* LpfProvider */
     g_object_class_override_property (object_class,
@@ -167,6 +139,5 @@ lpf_provider_de_db_init (LpfProviderDeDb *self)
 LpfProviderDeDb *
 lpf_provider_de_db_new (void)
 {
-    return g_object_new (LPF_TYPE_PROVIDER_DE_DB, LPF_PROVIDER_PROP_NAME,
-                         PROVIDER_NAME, NULL);
+    return g_object_new (LPF_TYPE_PROVIDER_DE_DB, NULL);
 }
diff --git a/src/providers/hafas-bin6.c b/src/providers/hafas-bin6.c
index c0be135..33edc4e 100644
--- a/src/providers/hafas-bin6.c
+++ b/src/providers/hafas-bin6.c
@@ -63,7 +63,6 @@ typedef struct _LpfProviderGotItUserData {
 typedef struct _LpfProviderHafasBin6Private LpfProviderHafasBin6Private;
 
 struct _LpfProviderHafasBin6Private {
-    gchar *name;
     SoupSession *session;
     char *logdir;
     gboolean debug;
@@ -721,12 +720,9 @@ static void
 lpf_provider_hafas_bin6_set_property (GObject *object, guint prop_id,
                                       const GValue *value, GParamSpec *pspec)
 {
-    LpfProviderHafasBin6Private *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        /* construct only */
-        priv->name = g_value_dup_string (value);
+	g_warn_if_reached ();
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -739,11 +735,9 @@ static void
 lpf_provider_hafas_bin6_get_property (GObject *object, guint prop_id,
                                       GValue *value, GParamSpec *pspec)
 {
-    LpfProviderHafasBin6Private *priv = GET_PRIVATE (object);
-
     switch (prop_id) {
     case PROP_NAME:
-        g_value_set_string (value, priv->name);
+        g_value_set_string (value, PROVIDER_NAME);
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -879,16 +873,6 @@ lpf_provider_hafas_bin6_deactivate (LpfProvider *self, GObject *obj)
 
 
 static void
-lpf_provider_hafas_bin6_finalize (GObject *self)
-{
-    LpfProviderHafasBin6Private *priv = GET_PRIVATE(self);
-    g_free (priv->name);
-
-    G_OBJECT_CLASS (lpf_provider_hafas_bin6_parent_class)->finalize (self);
-}
-
-
-static void
 lpf_provider_hafas_bin6_class_init (LpfProviderHafasBin6Class *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -897,7 +881,6 @@ lpf_provider_hafas_bin6_class_init (LpfProviderHafasBin6Class *klass)
 
     object_class->get_property = lpf_provider_hafas_bin6_get_property;
     object_class->set_property = lpf_provider_hafas_bin6_set_property;
-    object_class->finalize = lpf_provider_hafas_bin6_finalize;
 
     klass->locs_url = lpf_provider_hafas_bin6_locs_url;
     klass->trips_url = lpf_provider_hafas_bin6_trips_url;