[gnome-control-center/extensible-shell] [appearance] Check for NULL values
- From: William Jon McCann <mccann src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-control-center/extensible-shell] [appearance] Check for NULL values
- Date: Sat, 16 Jan 2010 10:30:59 +0000 (UTC)
commit 1b9ec60b0de69ba9f09c1a4afb3aaa4e81d0c81e
Author: William Jon McCann <jmccann redhat com>
Date: Sat Jan 16 05:29:57 2010 -0500
[appearance] Check for NULL values
capplets/appearance/cc-background-item.c | 16 ++++++++++++----
capplets/appearance/cc-background-page.c | 12 ++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/capplets/appearance/cc-background-item.c b/capplets/appearance/cc-background-item.c
index ed48fef..377d1fc 100644
--- a/capplets/appearance/cc-background-item.c
+++ b/capplets/appearance/cc-background-item.c
@@ -112,7 +112,9 @@ static GnomeBGPlacement
string_to_placement (const char *option)
{
int i = GNOME_BG_PLACEMENT_SCALED;
- gconf_string_to_enum (placement_lookup, option, &i);
+ if (option != NULL) {
+ gconf_string_to_enum (placement_lookup, option, &i);
+ }
return i;
}
@@ -120,7 +122,9 @@ static GnomeBGColorType
string_to_shading (const char *shading)
{
int i = GNOME_BG_COLOR_SOLID;
- gconf_string_to_enum (shading_lookup, shading, &i);
+ if (shading != NULL) {
+ gconf_string_to_enum (shading_lookup, shading, &i);
+ }
return i;
}
@@ -165,8 +169,12 @@ set_bg_properties (CcBackgroundItem *item)
if (item->priv->filename)
gnome_bg_set_filename (item->priv->bg, item->priv->filename);
- gdk_color_parse (item->priv->primary_color, &pcolor);
- gdk_color_parse (item->priv->secondary_color, &scolor);
+ if (item->priv->primary_color != NULL) {
+ gdk_color_parse (item->priv->primary_color, &pcolor);
+ }
+ if (item->priv->secondary_color != NULL) {
+ gdk_color_parse (item->priv->secondary_color, &scolor);
+ }
placement = string_to_placement (item->priv->placement);
shading = string_to_shading (item->priv->shading);
diff --git a/capplets/appearance/cc-background-page.c b/capplets/appearance/cc-background-page.c
index 58bbd80..7ebdd94 100644
--- a/capplets/appearance/cc-background-page.c
+++ b/capplets/appearance/cc-background-page.c
@@ -1679,12 +1679,14 @@ on_gconf_color1_changed (GConfClient *client,
CcBackgroundPage *page)
{
CcBackgroundItem *item;
- GdkColor color;
+ GdkColor color = { 0, 0, 0, 0 };
const char *colorhex;
colorhex = gconf_value_get_string (entry->value);
- gdk_color_parse (colorhex, &color);
+ if (colorhex != NULL) {
+ gdk_color_parse (colorhex, &color);
+ }
gtk_color_button_set_color (GTK_COLOR_BUTTON (page->priv->primary_color_picker),
&color);
@@ -1703,14 +1705,16 @@ on_gconf_color2_changed (GConfClient *client,
CcBackgroundPage *page)
{
CcBackgroundItem *item;
- GdkColor color;
+ GdkColor color = { 0, 0, 0, 0 };
const char *colorhex;
ui_update_sensitivities (page);
colorhex = gconf_value_get_string (entry->value);
- gdk_color_parse (colorhex, &color);
+ if (colorhex != NULL) {
+ gdk_color_parse (colorhex, &color);
+ }
gtk_color_button_set_color (GTK_COLOR_BUTTON (page->priv->secondary_color_picker),
&color);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]