Revert "gsettings: remove long-deprecated "schema" property"
authorRyan Lortie <desrt@desrt.ca>
Tue, 24 Jun 2014 20:56:20 +0000 (16:56 -0400)
committerRyan Lortie <desrt@desrt.ca>
Tue, 24 Jun 2014 20:57:12 +0000 (16:57 -0400)
This reverts commit cf9b162e0d0defaff2ad5c85aeaf7af0899ad22f.

It turns out that there are still a very large number of users of this
API.

https://bugzilla.gnome.org/show_bug.cgi?id=732102

gio/gsettings.c

index 604e098..fdc3c9d 100644 (file)
@@ -749,6 +749,30 @@ g_settings_class_init (GSettingsClass *class)
                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
+   * GSettings:schema:
+   *
+   * The name of the schema that describes the types of keys
+   * for this #GSettings object.
+   *
+   * The type of this property is *not* #GSettingsSchema.
+   * #GSettingsSchema has only existed since version 2.32 and
+   * unfortunately this name was used in previous versions to refer to
+   * the schema ID rather than the schema itself.  Take care to use the
+   * 'settings-schema' property if you wish to pass in a
+   * #GSettingsSchema.
+   *
+   * Deprecated:2.32:Use the 'schema-id' property instead.  In a future
+   * version, this property may instead refer to a #GSettingsSchema.
+   */
+  g_object_class_install_property (object_class, PROP_SCHEMA_ID,
+    g_param_spec_string ("schema",
+                         P_("Schema name"),
+                         P_("The name of the schema for this settings object"),
+                         NULL,
+                         G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_DEPRECATED | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  /**
    * GSettings:schema-id:
    *
    * The name of the schema that describes the types of keys