diff options
Diffstat (limited to 'mate-panel/panel-background.c')
| -rw-r--r-- | mate-panel/panel-background.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c index 0197fb5e..b5c475d7 100644 --- a/mate-panel/panel-background.c +++ b/mate-panel/panel-background.c @@ -39,7 +39,6 @@ #include "panel-util.h" - static gboolean panel_background_composite (PanelBackground *background); static void load_background_file (PanelBackground *background); @@ -244,7 +243,6 @@ panel_background_composite (PanelBackground *background) background->composited = TRUE; - panel_background_prepare (background); return TRUE; @@ -419,7 +417,7 @@ panel_background_update_has_alpha (PanelBackground *background) background->loaded_image) has_alpha = gdk_pixbuf_get_has_alpha (background->loaded_image); - background->has_alpha = has_alpha; + background->has_alpha = (has_alpha != FALSE); } static void @@ -492,16 +490,13 @@ static void panel_background_set_image_no_update (PanelBackground *background, const char *image) { - if (background->loaded_image) - g_object_unref (background->loaded_image); - background->loaded_image = NULL; - - if (background->image) - g_free (background->image); - background->image = NULL; + g_clear_object (&background->loaded_image); + g_free (background->image); if (image && image [0]) background->image = g_strdup (image); + else + background->image = NULL; panel_background_update_has_alpha (background); } @@ -603,7 +598,7 @@ panel_background_set (PanelBackground *background, void panel_background_set_default_style (PanelBackground *background, - GdkRGBA *color, + const GdkRGBA *color, cairo_pattern_t *pattern) { g_return_if_fail (color != NULL); @@ -621,7 +616,6 @@ panel_background_set_default_style (PanelBackground *background, panel_background_prepare (background); } - void panel_background_realized (PanelBackground *background, GdkWindow *window) @@ -759,17 +753,10 @@ panel_background_free (PanelBackground *background) { free_transformed_resources (background); - if (background->image) - g_free (background->image); - background->image = NULL; + g_clear_pointer (&background->image, g_free); - if (background->loaded_image) - g_object_unref (background->loaded_image); - background->loaded_image = NULL; - - if (background->window) - g_object_unref (background->window); - background->window = NULL; + g_clear_object (&background->loaded_image); + g_clear_object (&background->window); if (background->default_pattern) cairo_pattern_destroy (background->default_pattern); |