diff options
| author |  Patrick Griffis <tingping@tingping.se> | 2015-12-26 20:41:49 -0500 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-01-19 19:35:10 -0500 |
| commit | 8a9894874ecbec59c8b34db7ee3ded3f3375b703 (patch) | |
| tree | 52c5541c7f61e6d855d5f7d429746a92efc07dad /src | |
| parent | 0646e115fd635e0b96739ea39e65c0ef78ffaa30 (diff) | |
about-dialog: Use GPL2 from Gtk3
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/trg-about-window.c | 19 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4d9b89a..f60a61a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,7 @@ appdata_DATA = transmission-remote-gtk.appdata.xml endif bin_PROGRAMS = transmission-remote-gtk -AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\" -DTRGLICENSE=\""$(trglicense)"\" $(libcurl_CFLAGS) $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gio_CFLAGS) $(notify_CFLAGS) $(libproxy_CFLAGS) $(libappindicator_CFLAGS) $(mrss_CFLAGS) -I$(top_srcdir)/extern +AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\" $(libcurl_CFLAGS) $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gio_CFLAGS) $(notify_CFLAGS) $(libproxy_CFLAGS) $(libappindicator_CFLAGS) $(mrss_CFLAGS) -I$(top_srcdir)/extern transmission_remote_gtk_SOURCES = \ trg-cell-renderer-speed.c \ 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; } |