[gthumb/gthumb-3-2] Empty Options dialog after Canceling it once

[Paolo Bacchilega <paobac src gnome org>]

commit c79a7887c57014972ae03abf15f9c818cc8adb33
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Nov 11 09:37:05 2013 +0100

    Empty Options dialog after Canceling it once
    
    [bug #711788]

 extensions/cairo_io/gth-image-saver-jpeg.c |    4 ++--
 extensions/cairo_io/gth-image-saver-png.c  |    5 +++--
 extensions/cairo_io/gth-image-saver-tga.c  |    5 +++--
 extensions/cairo_io/gth-image-saver-tiff.c |    4 ++--
 extensions/cairo_io/gth-image-saver-webp.c |    5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/extensions/cairo_io/gth-image-saver-jpeg.c b/extensions/cairo_io/gth-image-saver-jpeg.c
index f746a71..dd9e51b 100644
--- a/extensions/cairo_io/gth-image-saver-jpeg.c
+++ b/extensions/cairo_io/gth-image-saver-jpeg.c
@@ -78,8 +78,8 @@ gth_image_saver_jpeg_get_control (GthImageSaver *base)
        int            i;
        int            active_idx;
 
-       if (self->priv->builder == NULL)
-               self->priv->builder = _gtk_builder_new_from_file ("jpeg-options.ui", "cairo_io");
+       _g_object_unref (self->priv->builder);
+       self->priv->builder = _gtk_builder_new_from_file ("jpeg-options.ui", "cairo_io");
 
        active_idx = 0;
        extensions = g_strsplit (gth_image_saver_get_extensions (base), " ", -1);
diff --git a/extensions/cairo_io/gth-image-saver-png.c b/extensions/cairo_io/gth-image-saver-png.c
index 665560c..269950c 100644
--- a/extensions/cairo_io/gth-image-saver-png.c
+++ b/extensions/cairo_io/gth-image-saver-png.c
@@ -67,8 +67,8 @@ gth_image_saver_png_get_control (GthImageSaver *base)
 {
        GthImageSaverPng *self = GTH_IMAGE_SAVER_PNG (base);
 
-       if (self->priv->builder == NULL)
-               self->priv->builder = _gtk_builder_new_from_file ("png-options.ui", "cairo_io");
+       _g_object_unref (self->priv->builder);
+       self->priv->builder = _gtk_builder_new_from_file ("png-options.ui", "cairo_io");
 
        gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, 
"png_compression_adjustment")),
                                  g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL));
@@ -366,4 +366,5 @@ gth_image_saver_png_init (GthImageSaverPng *self)
 {
        self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_PNG, GthImageSaverPngPrivate);
        self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_PNG_SCHEMA);
+       self->priv->builder = NULL;
 }
diff --git a/extensions/cairo_io/gth-image-saver-tga.c b/extensions/cairo_io/gth-image-saver-tga.c
index 3b27fe9..ae7ff92 100644
--- a/extensions/cairo_io/gth-image-saver-tga.c
+++ b/extensions/cairo_io/gth-image-saver-tga.c
@@ -51,8 +51,8 @@ gth_image_saver_tga_get_control (GthImageSaver *base)
 {
        GthImageSaverTga *self = GTH_IMAGE_SAVER_TGA (base);
 
-       if (self->priv->builder == NULL)
-               self->priv->builder = _gtk_builder_new_from_file ("tga-options.ui", "cairo_io");
+       _g_object_unref (self->priv->builder);
+       self->priv->builder = _gtk_builder_new_from_file ("tga-options.ui", "cairo_io");
 
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, 
"tga_rle_compression_checkbutton")),
                                      g_settings_get_boolean (self->priv->settings, 
PREF_TGA_RLE_COMPRESSION));
@@ -357,4 +357,5 @@ gth_image_saver_tga_init (GthImageSaverTga *self)
 {
        self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_TGA, GthImageSaverTgaPrivate);
        self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_TGA_SCHEMA);
+       self->priv->builder = NULL;
 }
diff --git a/extensions/cairo_io/gth-image-saver-tiff.c b/extensions/cairo_io/gth-image-saver-tiff.c
index 1aa39da..40671ae 100644
--- a/extensions/cairo_io/gth-image-saver-tiff.c
+++ b/extensions/cairo_io/gth-image-saver-tiff.c
@@ -76,8 +76,8 @@ gth_image_saver_tiff_get_control (GthImageSaver *base)
        int                 active_idx;
        GthTiffCompression  compression_type;
 
-       if (self->priv->builder == NULL)
-               self->priv->builder = _gtk_builder_new_from_file ("tiff-options.ui", "cairo_io");
+       _g_object_unref (self->priv->builder);
+       self->priv->builder = _gtk_builder_new_from_file ("tiff-options.ui", "cairo_io");
 
        active_idx = 0;
        extensions = g_strsplit (gth_image_saver_get_extensions (base), " ", -1);
diff --git a/extensions/cairo_io/gth-image-saver-webp.c b/extensions/cairo_io/gth-image-saver-webp.c
index 1b4e20c..aafe0d1 100644
--- a/extensions/cairo_io/gth-image-saver-webp.c
+++ b/extensions/cairo_io/gth-image-saver-webp.c
@@ -55,8 +55,8 @@ gth_image_saver_webp_get_control (GthImageSaver *base)
 {
        GthImageSaverWebp *self = GTH_IMAGE_SAVER_WEBP (base);
 
-       if (self->priv->builder == NULL)
-               self->priv->builder = _gtk_builder_new_from_file ("webp-options.ui", "cairo_io");
+       _g_object_unref (self->priv->builder);
+       self->priv->builder = _gtk_builder_new_from_file ("webp-options.ui", "cairo_io");
 
        gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("quality_adjustment")),
                                  g_settings_get_int (self->priv->settings, PREF_WEBP_QUALITY));
@@ -395,4 +395,5 @@ gth_image_saver_webp_init (GthImageSaverWebp *self)
 {
        self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SAVER_WEBP, GthImageSaverWebpPrivate);
        self->priv->settings = g_settings_new (GTHUMB_IMAGE_SAVERS_WEBP_SCHEMA);
+       self->priv->builder = NULL;
 }