Fix display of window icon

[pspp-builds.git] / src / ui / gui / about.c

diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index b6c02203b312cb723d24190632431f15b4c3bf20..8ca91cbe8281d56a14eea230f39fe6afcbb46546 100644 (file)
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -1,38 +1,36 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2006, 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2006, 2007  Free Software Foundation
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
+#include <libpspp/copyleft.h>
 #include <libpspp/version.h>
 #include "about.h"
 #include "helper.h"
 
+
 const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
 
 void
 about_new (GtkMenuItem *m, GtkWindow *parent)
 {
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *about =  get_widget_assert (xml, "aboutdialog1");
 
@@ -43,8 +41,7 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
 
 
-  gtk_window_set_icon_from_file (GTK_WINDOW (about),
-                                relocate (PKGDATADIR "/psppicon.png"), 0);
+  gtk_window_set_icon_name (GTK_WINDOW (about), "psppicon");
 
   gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
                                "http://www.gnu.org/software/pspp");
@@ -58,6 +55,10 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG (about),
                                artists);
 
+  gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (about),
+                               copyleft);
+
+
   gtk_window_set_transient_for (GTK_WINDOW (about), parent);
 
   gtk_window_set_modal (GTK_WINDOW (about), TRUE);