[monkey-bubble: 701/753] set the icon if the property of GnomeProgram is set. the string can be a

[Sven Herzberg <herzi src gnome org>]

commit 936b2222b9655c53a23044d6ccd8e63fa62450ff
Author: George Lebl <jirka 5z com>
Date:   Fri Sep 28 23:03:08 2001 +0000

    set the icon if the property of GnomeProgram is set. the string can be a
    
    Fri Sep 28 15:54:23 2001  George Lebl <jirka 5z com>
    
    	* gnome-app.c: set the icon if the property of GnomeProgram is set.
    	  the string can be a ';' separated list of files, so that multiple
    	  icons can be optionally set.
    
    	* gnome-about.c, gnome-app.c, gnome-appbar.c, gnome-client.c
    	  gnome-color-picker.c, gnome-file-entry.c, gnome-href.c,
    	  gnome-icon-entry.c, gnome-icon-list.c, gnome-pixmap-entry.c,
    	  gnome-scores.c, gnome-entry.c, gnome-druid-page-edge.c,
    	  gnome-druid-page-standard.c, gnome-druid-page.c,
    	  gnome-font-picker.c, gnome-icon-sel.c, gnome-messagebox.c,
    	  gnome-propertybox.c:  Make finalize and destroy behave
    	  as described in gtk docs.  Add finalize where needed,
    	  and add some more use of the gnome-macros.h.  Also remove
    	  unused finalize and destroy overrides as they just add
    	  cruft code.
    
    	* gnome-about.c: Actually free stuff on finalize
    
    	* gnome-window-icon.c: add some preconditions
    
    	* gnome-entry.c: correct gconf usage

 libgnomeui/gnome-scores.c |   28 ++++++----------------------
 1 files changed, 6 insertions(+), 22 deletions(-)
---
diff --git a/libgnomeui/gnome-scores.c b/libgnomeui/gnome-scores.c
index f1dff6c..033cbb8 100644
--- a/libgnomeui/gnome-scores.c
+++ b/libgnomeui/gnome-scores.c
@@ -60,7 +60,6 @@ struct _GnomeScoresPrivate
 
 static void gnome_scores_class_init (GnomeScoresClass *klass);
 static void gnome_scores_instance_init (GnomeScores      *scores);
-static void gnome_scores_destroy    (GtkObject        *object);
 static void gnome_scores_finalize   (GObject          *object);
 
 /**
@@ -124,44 +123,29 @@ gnome_scores_instance_init (GnomeScores *gs)
 static void
 gnome_scores_class_init (GnomeScoresClass *class)
 {
-	GtkObjectClass *object_class;
 	GObjectClass *gobject_class;
 
-	object_class = (GtkObjectClass *) class;
 	gobject_class = (GObjectClass *) class;
 
-	object_class->destroy = gnome_scores_destroy;
 	gobject_class->finalize = gnome_scores_finalize;
 }
 
 static void
-gnome_scores_destroy(GtkObject *object)
+gnome_scores_finalize(GObject *object)
 {
 	GnomeScores *gs = GNOME_SCORES(object);
 
-	/* remember, destroy can be run multiple times! */
-
-	g_free(gs->_priv->label_names);
+	g_free (gs->_priv->label_names);
 	gs->_priv->label_names = NULL;
-	g_free(gs->_priv->label_scores);
+	g_free (gs->_priv->label_scores);
 	gs->_priv->label_scores = NULL;
-	g_free(gs->_priv->label_times);
+	g_free (gs->_priv->label_times);
 	gs->_priv->label_times = NULL;
 
-	if(GTK_OBJECT_CLASS(parent_class)->destroy)
-		(* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
-}
-
-static void
-gnome_scores_finalize(GObject *object)
-{
-	GnomeScores *gs = GNOME_SCORES(object);
-
-	g_free(gs->_priv);
+	g_free (gs->_priv);
 	gs->_priv = NULL;
 
-	if(G_OBJECT_CLASS(parent_class)->finalize)
-		(* G_OBJECT_CLASS(parent_class)->finalize) (object);
+	GNOME_CALL_PARENT_HANDLER (G_OBJECT_CLASS, finalize, (object));
 }
 
 /**