diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
commit | e0d00f10c50104ce1a77d035c9c2fc14545c0b92 (patch) | |
tree | e70bdc4879a8cdaf77dce5ff389d8e73cfddd4c3 /src/trg-about-window.c | |
parent | 4e526acfb28ca68322009c5a958b9926cf3c8413 (diff) | |
parent | 7c29748eee49c59ad09831924f4bbefc9b7ee5f5 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'src/trg-about-window.c')
-rw-r--r-- | src/trg-about-window.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/trg-about-window.c b/src/trg-about-window.c index 8dbf7a8..c14482b 100644 --- a/src/trg-about-window.c +++ b/src/trg-about-window.c @@ -23,24 +23,14 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <json-glib/json-glib.h> #include "trg-about-window.h" -#include "util.h" GtkWidget *trg_about_window_new(GtkWindow * parent) { GtkWidget *dialog; GdkPixbuf *logo; - gchar *licenseText = NULL; const gchar *trgAuthors[] = { "Alan Fitton <alan@eth0.org.uk>", NULL }; - gchar *licenseFile; - -#ifdef WIN32 - licenseFile = trg_win32_support_path("COPYING.TXT"); -#else - licenseFile = g_strdup(TRGLICENSE); -#endif dialog = gtk_about_dialog_new(); gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); @@ -56,12 +46,7 @@ GtkWidget *trg_about_window_new(GtkWindow * parent) g_object_unref(logo); } - if (g_file_get_contents(licenseFile, &licenseText, NULL, NULL)) { - gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), - licenseText); - } else { - gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog), "GPL2"); - } + gtk_about_dialog_set_license_type (GTK_ABOUT_DIALOG(dialog), GTK_LICENSE_GPL_2_0); gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), PACKAGE_NAME); @@ -92,8 +77,6 @@ GtkWidget *trg_about_window_new(GtkWindow * parent) "* Åke Svensson (Swedish)\n" "* ROR191 (Ukranian)\n"); - g_free(licenseFile); - g_free(licenseText); return dialog; } |