Commit 5d0edd70 authored by Chyla Zbigniew's avatar Chyla Zbigniew
Browse files

libgimpwidgets/gimppixmap.c (gimp_color_button_destroy): Move variable


* app/commands.c (image_scale_callback),
libgimpwidgets/gimpchainbutton.c (gimp_chain_button_destroy),
libgimpwidgets/gimpcolorbutton.c (gimp_color_button_destroy):
libgimpwidgets/gimppixmap.c (gimp_color_button_destroy):
Move variable assignments out of assertions to allow compilation
with "G_DISABLE_ASSERT" defined.
parent b05f238d
2001-03-04 Zbigniew Chyla <cyba@gnome.pl>
* app/commands.c (image_scale_callback),
libgimpwidgets/gimpchainbutton.c (gimp_chain_button_destroy),
libgimpwidgets/gimpcolorbutton.c (gimp_color_button_destroy):
libgimpwidgets/gimppixmap.c (gimp_color_button_destroy):
Move variable assignments out of assertions to allow compilation
with "G_DISABLE_ASSERT" defined.
2001-03-04 Sven Neumann <sven@gimp.org>
* app/preferences_dialog.c (prefs_save_callback): applied a patch
......
......@@ -1446,9 +1446,9 @@ static void
image_scale_callback (GtkWidget *widget,
gpointer client_data)
{
ImageResize *image_scale = NULL;
ImageResize *image_scale = (ImageResize *) client_data;
g_assert ((image_scale = (ImageResize *) client_data) != NULL);
g_assert (image_scale != NULL);
g_assert (image_scale->gimage != NULL);
gtk_widget_set_sensitive (image_scale->resize->resize_shell, FALSE);
......
......@@ -1446,9 +1446,9 @@ static void
image_scale_callback (GtkWidget *widget,
gpointer client_data)
{
ImageResize *image_scale = NULL;
ImageResize *image_scale = (ImageResize *) client_data;
g_assert ((image_scale = (ImageResize *) client_data) != NULL);
g_assert (image_scale != NULL);
g_assert (image_scale->gimage != NULL);
gtk_widget_set_sensitive (image_scale->resize->resize_shell, FALSE);
......
......@@ -1446,9 +1446,9 @@ static void
image_scale_callback (GtkWidget *widget,
gpointer client_data)
{
ImageResize *image_scale = NULL;
ImageResize *image_scale = (ImageResize *) client_data;
g_assert ((image_scale = (ImageResize *) client_data) != NULL);
g_assert (image_scale != NULL);
g_assert (image_scale->gimage != NULL);
gtk_widget_set_sensitive (image_scale->resize->resize_shell, FALSE);
......
......@@ -1446,9 +1446,9 @@ static void
image_scale_callback (GtkWidget *widget,
gpointer client_data)
{
ImageResize *image_scale = NULL;
ImageResize *image_scale = (ImageResize *) client_data;
g_assert ((image_scale = (ImageResize *) client_data) != NULL);
g_assert (image_scale != NULL);
g_assert (image_scale->gimage != NULL);
gtk_widget_set_sensitive (image_scale->resize->resize_shell, FALSE);
......
......@@ -73,9 +73,9 @@ static GtkTableClass *parent_class = NULL;
static void
gimp_chain_button_destroy (GtkObject *object)
{
GimpChainButton *gcb;
GimpChainButton *gcb = GIMP_CHAIN_BUTTON (object);
g_return_if_fail (gcb = GIMP_CHAIN_BUTTON (object));
g_return_if_fail (gcb != NULL);
if (gcb->broken)
gdk_pixmap_unref (gcb->broken);
......
......@@ -88,9 +88,9 @@ static GtkPreviewClass *parent_class = NULL;
static void
gimp_color_button_destroy (GtkObject *object)
{
GimpColorButton *gcb;
GimpColorButton *gcb = GIMP_COLOR_BUTTON (object);
g_return_if_fail (gcb = GIMP_COLOR_BUTTON (object));
g_return_if_fail (gcb != NULL);
g_free (gcb->title);
......
......@@ -38,9 +38,9 @@ static GtkPixmapClass *parent_class = NULL;
static void
gimp_pixmap_destroy (GtkObject *object)
{
GimpPixmap *pixmap;
GimpPixmap *pixmap = GIMP_PIXMAP (object);
g_return_if_fail (pixmap = GIMP_PIXMAP (object));
g_return_if_fail (pixmap != NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment