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 949fdcdf4c2fb6222d65e03e6dd44108e2c644ab..8ca91cbe8281d56a14eea230f39fe6afcbb46546 100644 (file)
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -18,18 +18,19 @@
 #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");
 
@@ -40,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");
@@ -55,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);