[glib/new-gsettings] drop locked flag from GSettings



commit 214b3ec658a7757134458a56d0ea780cf53619b8
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 14 12:09:57 2010 -0400

    drop locked flag from GSettings
    
    It is not really needed, and delayed-apply is a construct-only property
    anyway

 gio/gsettings.c |    6 ------
 gio/gsettings.h |    3 ---
 2 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 7f4dac6..1b05e87 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -39,7 +39,6 @@ struct _GSettingsPrivate {
 
   guint handler_id;
   guint unapplied_handler;
-  gboolean locked;
   gboolean delayed;
 };
 
@@ -186,10 +185,6 @@ g_settings_set_delay_apply (GSettings *settings,
     {
       GSettingsBackend *backend;
 
-      if G_UNLIKELY (settings->priv->locked)
-        g_error ("Can only set delayed-apply attribute on "
-                 "freshly-created GSettings instances");
-
       g_assert (delayed);
 
       backend = g_delayed_settings_backend_new (settings->priv->backend,
@@ -215,7 +210,6 @@ g_settings_set_delay_apply (GSettings *settings,
       settings->priv->base_path = g_strdup ("");
 
       settings->priv->delayed = TRUE;
-      settings->priv->locked = TRUE;
     }
 }
 
diff --git a/gio/gsettings.h b/gio/gsettings.h
index bf7649d..79553b4 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -68,9 +68,6 @@ gboolean                g_settings_get_delay_apply                      (GSettin
 gboolean                g_settings_get_has_unapplied                    (GSettings          *settings);
 void                    g_settings_set_delay_apply                      (GSettings          *settings,
                                                                          gboolean            delay);
-gboolean                g_settings_get_locked                           (GSettings          *settings);
-void                    g_settings_lock                                 (GSettings          *settings);
-
 GSettings *             g_settings_new                                  (const gchar        *schema);
 GSettings *             g_settings_new_from_path                        (const gchar        *path);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]