diff gui/dialog/skinbrowser.c @ 36008:d154d0035cb0

Don't use WidgetDestroy(). (It's not the best idea to call gtk_widget_destroy() there while the object is currently being destroyed.) In order to set the widget pointer to NULL, use gtk_widget_destroyed(). Simply destroy the widget to automatically get the pointer set to NULL then.
author ib
date Sat, 30 Mar 2013 14:32:07 +0000
parents 135a2c940db8
children 5c720c434d56
line wrap: on
line diff
--- a/gui/dialog/skinbrowser.c	Sat Mar 30 14:13:23 2013 +0000
+++ b/gui/dialog/skinbrowser.c	Sat Mar 30 14:32:07 2013 +0000
@@ -61,7 +61,6 @@
   }
  }
  gtk_widget_destroy( SkinBrowser );
- SkinBrowser=NULL;
 }
 
 static void on_SkinList_select_row( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data )
@@ -79,7 +78,6 @@
    free( skinName );
    skinName=strdup( sbSelectedSkin );
    gtk_widget_destroy( SkinBrowser );
-   SkinBrowser=NULL;
   }
 }
 
@@ -145,7 +143,7 @@
  gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
  gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 
- gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&SkinBrowser );
+ gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&SkinBrowser );
  gtk_signal_connect( GTK_OBJECT( SkinList ),"select_row",GTK_SIGNAL_FUNC( on_SkinList_select_row ),NULL );
  gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
  gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );