projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove recoding in data_store.
[pspp]
/
src
/
ui
/
gui
/
about.c
diff --git
a/src/ui/gui/about.c
b/src/ui/gui/about.c
index 949fdcdf4c2fb6222d65e03e6dd44108e2c644ab..c217833cbea5bf140f99c36cc2aa75106a8401b5 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 <config.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
+#include <libpspp/copyleft.h>
#include <libpspp/version.h>
#include "about.h"
#include "helper.h"
#include <libpspp/version.h>
#include "about.h"
#include "helper.h"
-const static gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
+
+static const gchar *artists[] = { "Patrick Brunier", "Dondi Bogusky", NULL};
void
about_new (GtkMenuItem *m, GtkWindow *parent)
{
void
about_new (GtkMenuItem *m, GtkWindow *parent)
{
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
GtkWidget *about = get_widget_assert (xml, "aboutdialog1");
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_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");
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_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);
gtk_window_set_transient_for (GTK_WINDOW (about), parent);
gtk_window_set_modal (GTK_WINDOW (about), TRUE);