summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wood <thos@gnome.org>2008-05-18 21:33:07 +0000
committerThomas Wood <thos@src.gnome.org>2008-05-18 21:33:07 +0000
commite544be375bec607cf49fc450fe7567d56ea0eac1 (patch)
treec72137a78c6be16dd3a9574cee794f30e013719a
parent4edaa68a86dbe8450b075ad9c4414f0d3bcdfc41 (diff)
downloadgnome-control-center-e544be375bec607cf49fc450fe7567d56ea0eac1.tar.gz
Allow the data property to be read as well as written.
2008-05-18 Thomas Wood <thos@gnome.org> * gconf-property-editor.c: (gconf_property_editor_class_init), (gconf_property_editor_get_prop): Allow the data property to be read as well as written. svn path=/trunk/; revision=8718
-rw-r--r--capplets/common/ChangeLog6
-rw-r--r--capplets/common/gconf-property-editor.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index efd649816..4b6ed325e 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-18 Thomas Wood <thos@gnome.org>
+
+ * gconf-property-editor.c: (gconf_property_editor_class_init),
+ (gconf_property_editor_get_prop): Allow the data property to be
+ read as well as written.
+
2008-05-18 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (gconf_property_editor_init),
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 287b2f64a..728b528e5 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -179,7 +179,7 @@ gconf_property_editor_class_init (GConfPropertyEditorClass *class)
g_param_spec_pointer ("data",
_("Property editor object data"),
_("Custom data required by the specific property editor"),
- G_PARAM_WRITABLE));
+ G_PARAM_READWRITE));
g_object_class_install_property
(object_class, PROP_DATA_FREE_CB,
@@ -276,6 +276,9 @@ gconf_property_editor_get_prop (GObject *object,
g_value_set_pointer (value, peditor->p->changeset);
break;
+ case PROP_DATA:
+ g_value_set_pointer (value, peditor->p->data);
+ break;
default:
g_warning ("Bad argument get");
break;