diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-04-17 21:50:45 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2020-04-17 21:50:45 +0000 |
| commit | 633f0fa52a786adbe149e9d3810e5a484df30626 (patch) | |
| tree | 967fbc77f6d9141ada74998362966207844d2d2f | |
| parent | 3483a3e1345733615aa0d3a8020b566b47817292 (diff) | |
| parent | adc2f4ad9e16a3529c03781b67ea9e28b8a3961c (diff) | |
| download | gtk+-633f0fa52a786adbe149e9d3810e5a484df30626.tar.gz | |
Merge branch 'jjardon/3_24_more_licenses' into 'gtk-3-24'
3.24: gtk/gtkaboutdialog: Add some more very common licenses:
See merge request GNOME/gtk!1672
| -rw-r--r-- | gtk/gtkaboutdialog.c | 5 | ||||
| -rw-r--r-- | gtk/gtkaboutdialog.h | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 9a0017544a..8bfbdac52e 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -125,7 +125,10 @@ static const LicenseInfo gtk_license_info [] = { { N_("GNU Lesser General Public License, version 2.1 only"), "https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" }, { N_("GNU Lesser General Public License, version 3 only"), "https://www.gnu.org/licenses/lgpl-3.0.html" }, { N_("GNU Affero General Public License, version 3 or later"), "https://www.gnu.org/licenses/agpl-3.0.html" }, - { N_("GNU Affero General Public License, version 3 only"), "https://www.gnu.org/licenses/agpl-3.0.html" } + { N_("GNU Affero General Public License, version 3 only"), "https://www.gnu.org/licenses/agpl-3.0.html" }, + { N_("BSD 3-Clause License"), "https://opensource.org/licenses/BSD-3-Clause" }, + { N_("Apache License, Version 2.0"), "https://opensource.org/licenses/Apache-2.0" }, + { N_("Mozilla Public License 2.0"), "https://opensource.org/licenses/MPL-2.0" } }; typedef struct diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h index dd09882d31..aaa0155211 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -88,7 +88,11 @@ typedef enum { GTK_LICENSE_LGPL_3_0_ONLY, GTK_LICENSE_AGPL_3_0, - GTK_LICENSE_AGPL_3_0_ONLY + GTK_LICENSE_AGPL_3_0_ONLY, + + GTK_LICENSE_BSD_3, + GTK_LICENSE_APACHE_2_0, + GTK_LICENSE_MPL_2_0 } GtkLicense; /** |