Index: ChangeLog =================================================================== RCS file: /cvs/gnome/gnome-games/ChangeLog,v retrieving revision 1.187 diff -u -r1.187 ChangeLog --- ChangeLog 6 Jan 2003 12:41:13 -0000 1.187 +++ ChangeLog 8 Jan 2003 18:11:36 -0000 @@ -1,3 +1,15 @@ +2003-01-08 Alex Duggan + + * aisleriot/menu.c, gataxx/gataxx.c + glines/glines.c, gnibbles/main.c + gnobots2/menu.c, gnome-stones/main.c + gnometris/tetris.cpp, gnomine/gnomine.c + gnotravex/gnotravex.c, gnotski/gnotski.c + gtali/gyahtzee.c, iagno/gnothello.c + mahjongg/mahjongg.c, same-gnome/same-gnome.c: + Use aisleriot's logo in it's about box, fix small memory + leaks in about boxes when not unref()'ing the pixbuf. + 2003-01-03 Ross Burton * configure.in: New version. Index: aisleriot/menu.c =================================================================== RCS file: /cvs/gnome/gnome-games/aisleriot/menu.c,v retrieving revision 1.50 diff -u -r1.50 menu.c --- aisleriot/menu.c 20 Aug 2002 09:43:31 -0000 1.50 +++ aisleriot/menu.c 8 Jan 2003 18:11:36 -0000 @@ -71,6 +71,7 @@ void help_about_callback () { + GdkPixbuf *pixbuf = NULL; const gchar *authors[] = { N_("Main program: Jonathan Blandford (jrb@redhat.com)"), N_(" Felix Bellaby (felix@pooh.u-net.com)"), @@ -90,7 +91,17 @@ }; const gchar *translator_credits = _("translator_credits"); + char *filename = NULL; + filename = gnome_program_locate_file (NULL, + GNOME_FILE_DOMAIN_APP_PIXMAP, ("gnome-aisleriot.png"), + TRUE, NULL); + if (filename != NULL) + { + pixbuf = gdk_pixbuf_new_from_file(filename, NULL); + g_free (filename); + } + { int i=0; while (authors[i] != NULL) { authors[i]=_(authors[i]); i++; } @@ -108,7 +119,11 @@ (const char **)authors, (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, - NULL); + pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + g_signal_connect (GTK_OBJECT (about), "destroy", (GtkSignalFunc) about_destroy_callback, Index: gataxx/gataxx.c =================================================================== RCS file: /cvs/gnome/gnome-games/gataxx/gataxx.c,v retrieving revision 1.29 diff -u -r1.29 gataxx.c --- gataxx/gataxx.c 27 Nov 2002 16:40:06 -0000 1.29 +++ gataxx/gataxx.c 8 Jan 2003 18:11:37 -0000 @@ -433,6 +433,9 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW(window)); Index: glines/glines.c =================================================================== RCS file: /cvs/gnome/gnome-games/glines/glines.c,v retrieving revision 1.37 diff -u -r1.37 glines.c --- glines/glines.c 27 Nov 2002 16:40:07 -0000 1.37 +++ glines/glines.c 8 Jan 2003 18:11:38 -0000 @@ -790,6 +790,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW(app)); g_signal_connect (G_OBJECT(about), "destroy", G_CALLBACK(gtk_widget_destroyed), &about); Index: gnibbles/main.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnibbles/main.c,v retrieving revision 1.45 diff -u -r1.45 main.c --- gnibbles/main.c 25 Nov 2002 13:46:10 -0000 1.45 +++ gnibbles/main.c 8 Jan 2003 18:11:39 -0000 @@ -224,7 +224,11 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); - gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show (about); Index: gnobots2/menu.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnobots2/menu.c,v retrieving revision 1.15 diff -u -r1.15 menu.c --- gnobots2/menu.c 11 Dec 2002 14:34:27 -0000 1.15 +++ gnobots2/menu.c 8 Jan 2003 18:11:39 -0000 @@ -233,6 +233,9 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW(app)); g_signal_connect (G_OBJECT(about), "destroy", G_CALLBACK(gtk_widget_destroyed), &about); Index: gnome-stones/main.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnome-stones/main.c,v retrieving revision 1.39 diff -u -r1.39 main.c --- gnome-stones/main.c 27 Nov 2002 16:40:11 -0000 1.39 +++ gnome-stones/main.c 8 Jan 2003 18:11:40 -0000 @@ -1074,6 +1074,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (app)); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show (about); Index: gnometris/tetris.cpp =================================================================== RCS file: /cvs/gnome/gnome-games/gnometris/tetris.cpp,v retrieving revision 1.31 diff -u -r1.31 tetris.cpp --- gnometris/tetris.cpp 25 Nov 2002 13:46:13 -0000 1.31 +++ gnometris/tetris.cpp 8 Jan 2003 18:11:41 -0000 @@ -1013,7 +1013,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); - + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (t->getWidget())); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show(about); Index: gnomine/gnomine.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnomine/gnomine.c,v retrieving revision 1.96 diff -u -r1.96 gnomine.c --- gnomine/gnomine.c 18 Oct 2002 10:06:35 -0000 1.96 +++ gnomine/gnomine.c 8 Jan 2003 18:11:42 -0000 @@ -323,6 +323,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + g_signal_connect (GTK_OBJECT (about), "destroy", GTK_SIGNAL_FUNC (gtk_widget_destroyed), &about); gtk_window_set_transient_for(GTK_WINDOW (about), GTK_WINDOW (window)); Index: gnotravex/gnotravex.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnotravex/gnotravex.c,v retrieving revision 1.34 diff -u -r1.34 gnotravex.c --- gnotravex/gnotravex.c 11 Dec 2002 15:44:41 -0000 1.34 +++ gnotravex/gnotravex.c 8 Jan 2003 18:11:42 -0000 @@ -1117,6 +1117,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show(about); Index: gnotski/gnotski.c =================================================================== RCS file: /cvs/gnome/gnome-games/gnotski/gnotski.c,v retrieving revision 1.27 diff -u -r1.27 gnotski.c --- gnotski/gnotski.c 27 Nov 2002 16:40:14 -0000 1.27 +++ gnotski/gnotski.c 8 Jan 2003 18:11:43 -0000 @@ -1043,6 +1043,10 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show(about); Index: gtali/gyahtzee.c =================================================================== RCS file: /cvs/gnome/gnome-games/gtali/gyahtzee.c,v retrieving revision 1.39 diff -u -r1.39 gyahtzee.c --- gtali/gyahtzee.c 27 Nov 2002 16:40:16 -0000 1.39 +++ gtali/gyahtzee.c 8 Jan 2003 18:11:43 -0000 @@ -384,7 +384,11 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); - gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about); gtk_widget_show (about); return FALSE; Index: iagno/gnothello.c =================================================================== RCS file: /cvs/gnome/gnome-games/iagno/gnothello.c,v retrieving revision 1.100 diff -u -r1.100 gnothello.c --- iagno/gnothello.c 19 Nov 2002 13:21:36 -0000 1.100 +++ iagno/gnothello.c 8 Jan 2003 18:11:44 -0000 @@ -435,7 +435,9 @@ strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); - + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + g_signal_connect (GTK_OBJECT (about), "destroy", GTK_SIGNAL_FUNC (gtk_widget_destroyed), &about); gtk_window_set_transient_for (GTK_WINDOW(about), GTK_WINDOW(window)); Index: mahjongg/mahjongg.c =================================================================== RCS file: /cvs/gnome/gnome-games/mahjongg/mahjongg.c,v retrieving revision 1.114 diff -u -r1.114 mahjongg.c --- mahjongg/mahjongg.c 11 Dec 2002 13:37:20 -0000 1.114 +++ mahjongg/mahjongg.c 8 Jan 2003 18:11:45 -0000 @@ -1388,6 +1388,10 @@ (const gchar **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window)); gtk_widget_show (about); } Index: same-gnome/same-gnome.c =================================================================== RCS file: /cvs/gnome/gnome-games/same-gnome/same-gnome.c,v retrieving revision 1.93 diff -u -r1.93 same-gnome.c --- same-gnome/same-gnome.c 19 Dec 2002 14:10:11 -0000 1.93 +++ same-gnome/same-gnome.c 8 Jan 2003 18:11:46 -0000 @@ -629,6 +629,9 @@ (const char **)documenters, strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, pixbuf); + if (pixbuf != NULL) + gdk_pixbuf_unref (pixbuf); + gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (app)); gtk_widget_show (about);