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

add safeguards for NULL values (closes bug #441036)

Browse source 
2007-07-01  Jens Granseuer  <jensgr@gmx.net>

	* gconf-property-editor.c: (peditor_string_value_changed),
	(peditor_color_value_changed): add safeguards for NULL values (closes
	bug #441036)

svn path=/trunk/; revision=7810
This commit is contained in:
Jens Granseuer 2007-07-01 15:01:23 +00:00 • committed by Jens Granseuer
parent 6f8421368b
commit 2d521a0b6e
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
capplets/common/ChangeLog
View file

@ -1,3 +1,9 @@
2007-07-01 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (peditor_string_value_changed),
(peditor_color_value_changed): add safeguards for NULL values (closes
bug #441036)
2007-06-29 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: (peditor_string_value_changed): compare the

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

@ -597,15 +597,19 @@ peditor_string_value_changed (GConfClient *client,
GConfPropertyEditor *peditor)
{
GConfValue *value, *value_wid;
const char *entry_current_text;
if (peditor->p->changeset != NULL)
gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
if (entry && (value = gconf_entry_get_value (entry))) {
const char *entry_current_text;
const char *gconf_text;
value_wid = peditor->p->conv_to_widget_cb (peditor, value);
gconf_text = gconf_value_get_string (value_wid);
entry_current_text = gtk_entry_get_text (GTK_ENTRY (peditor->p->ui_control));
if (strcmp (entry_current_text, gconf_value_get_string (value_wid)) != 0) {
if (gconf_text && strcmp (entry_current_text, gconf_text) != 0) {
gtk_entry_set_text (GTK_ENTRY (peditor->p->ui_control), gconf_value_get_string (value_wid));
}
gconf_value_free (value_wid);
@ -713,16 +717,21 @@ peditor_color_value_changed (GConfClient *client,
GConfPropertyEditor *peditor)
{
GConfValue *value, *value_wid;
GdkColor color;
if (peditor->p->changeset != NULL)
gconf_change_set_remove (peditor->p->changeset, peditor->p->key);
if (entry && (value = gconf_entry_get_value (entry))) {
const gchar *spec;
value_wid = peditor->p->conv_to_widget_cb (peditor, value);
gdk_color_parse (gconf_value_get_string (value_wid), &color);
gtk_color_button_set_color (
GTK_COLOR_BUTTON (peditor->p->ui_control), &color);
spec = gconf_value_get_string (value_wid);
if (spec) {
GdkColor color;
gdk_color_parse (gconf_value_get_string (value_wid), &color);
gtk_color_button_set_color (
GTK_COLOR_BUTTON (peditor->p->ui_control), &color);
}
gconf_value_free (value_wid);
}
}