applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add support for unsetting GConf values if the conversion handlers return

Browse source 
2007-05-08  Jens Granseuer  <jensgr@gmx.net>

	* gconf-property-editor.c: (peditor_set_gconf_value),
	(peditor_combo_box_widget_changed):
	add support for unsetting GConf values if the conversion handlers return
	null, and use it for the combo box editor

svn path=/trunk/; revision=7573
This commit is contained in:
Jens Granseuer 2007-05-07 22:28:48 +00:00 • committed by Jens Granseuer
parent 21b005ca5f
commit 8ae230b9ae
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/common/ChangeLog
View file

@ -1,3 +1,10 @@
2007-05-08 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (peditor_set_gconf_value),
(peditor_combo_box_widget_changed):
add support for unsetting GConf values if the conversion handlers return
null, and use it for the combo box editor
2007-05-01 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (peditor_combo_box_value_changed),

24
capplets/common/gconf-property-editor.c
View file

@ -410,14 +410,23 @@ peditor_set_gconf_value (GConfPropertyEditor *peditor,
const gchar *key,
GConfValue *value)
{
GConfClient *client = gconf_client_get_default();
if (peditor->p->changeset != NULL)
gconf_change_set_set (peditor->p->changeset, peditor->p->key, value);
else
gconf_client_set (client, peditor->p->key, value, NULL);
if (peditor->p->changeset != NULL) {
if (value)
gconf_change_set_set (peditor->p->changeset, peditor->p->key, value);
else
gconf_change_set_unset (peditor->p->changeset, peditor->p->key);
} else {
GConfClient *client = gconf_client_get_default();
if (value)
gconf_client_set (client, peditor->p->key, value, NULL);
else
gconf_client_unset (client, peditor->p->key, NULL);
g_object_unref (client);
}
g_object_unref (client);
}
static void
@ -1022,7 +1031,8 @@ peditor_combo_box_widget_changed (GConfPropertyEditor *peditor,
peditor_set_gconf_value (peditor, peditor->p->key, value);
g_signal_emit (peditor, peditor_signals[VALUE_CHANGED], 0, peditor->p->key, value);
gconf_value_free (value_wid);
gconf_value_free (value);
if (value)
gconf_value_free (value);
}
GObject *