[gnome-games] libgames-support: Stop using game_get_license in the Vala apps

From: Robert Ancell <rancell src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games] libgames-support: Stop using game_get_license in the Vala apps
Date: Wed, 29 Aug 2012 04:56:33 +0000 (UTC)
commit d91137f65490ea92a11fc27d154c7953653d4386
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Aug 29 16:56:04 2012 +1200

    libgames-support: Stop using game_get_license in the Vala apps

 gnome-mahjongg/src/gnome-mahjongg.vala      |    4 +++-
 gnomine/src/gnomine.vala                    |    4 +++-
 gnotravex/src/gnotravex.vala                |    2 +-
 libgames-support/GnomeGamesSupport-1.0.vapi |    3 ---
 lightsoff/src/lightsoff.vala                |    2 +-
 quadrapassel/src/quadrapassel.vala          |    3 ++-
 swell-foop/src/swell-foop.vala              |    4 +++-
 7 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/gnome-mahjongg/src/gnome-mahjongg.vala b/gnome-mahjongg/src/gnome-mahjongg.vala
index 695af35..88bf20a 100644
--- a/gnome-mahjongg/src/gnome-mahjongg.vala
+++ b/gnome-mahjongg/src/gnome-mahjongg.vala
@@ -547,13 +547,15 @@ public class Mahjongg : Gtk.Application
             null
         };
 
+        var license = "Mahjongg is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nMahjongg is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Mahjongg; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
+
         Gtk.show_about_dialog (window,
                                "program-name", _("Mahjongg"),
                                "version", VERSION,
                                "comments",
                                _("A matching game played with Mahjongg tiles.\n\nMahjongg is a part of GNOME Games."),
                                "copyright", "Copyright \xc2\xa9 1998-2008 Free Software Foundation, Inc.",
-                               "license", GnomeGamesSupport.get_license (_("Mahjongg")),
+                               "license", license,
                                "wrap-license", true,
                                "authors", authors,
                                "artists", artists,
diff --git a/gnomine/src/gnomine.vala b/gnomine/src/gnomine.vala
index ec2abda..ccfab75 100644
--- a/gnomine/src/gnomine.vala
+++ b/gnomine/src/gnomine.vala
@@ -726,6 +726,8 @@ public class GnoMine : Gtk.Application
             null
         };
 
+        var license = "Mines is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nMines is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Mines; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
+
         Gtk.show_about_dialog (window,
                                "name", _("Mines"),
                                "version", VERSION,
@@ -733,7 +735,7 @@ public class GnoMine : Gtk.Application
                                _("The popular logic puzzle minesweeper. Clear mines from a board using hints from squares you have already uncovered.\n\nMines is a part of GNOME Games."),
                                "copyright",
                                "Copyright \xc2\xa9 1997-2008 Free Software Foundation, Inc.",
-                               "license", GnomeGamesSupport.get_license (_("Mines")),
+                               "license", license,
                                "authors", authors,
                                "artists", artists,
                                "documenters", documenters,
diff --git a/gnotravex/src/gnotravex.vala b/gnotravex/src/gnotravex.vala
index d847dcc..608d91e 100644
--- a/gnotravex/src/gnotravex.vala
+++ b/gnotravex/src/gnotravex.vala
@@ -300,7 +300,7 @@ public class Gnotravex : Gtk.Application
     {
         string[] authors = { "Lars Rydlinge", "Robert Ancell", null };
         string[] documenters = { "Rob Bradford", null };
-        var license = GnomeGamesSupport.get_license (_("Tetravex"));
+        var license = "Tetravex is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nTetravex is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Tetravex; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
         Gtk.show_about_dialog (window,
                                "program-name", _("Tetravex"),
                                "version", VERSION,
diff --git a/libgames-support/GnomeGamesSupport-1.0.vapi b/libgames-support/GnomeGamesSupport-1.0.vapi
index 45a4189..3fe11c4 100644
--- a/libgames-support/GnomeGamesSupport-1.0.vapi
+++ b/libgames-support/GnomeGamesSupport-1.0.vapi
@@ -5,9 +5,6 @@
 [CCode (cprefix = "Games", lower_case_cprefix = "games_")]
 namespace GnomeGamesSupport
 {
-    [CCode (cheader_filename = "games-stock.h")]
-    public static string get_license (string game_name);
-
     [CCode (cheader_filename = "games-scores.h")]
     public void scores_startup ();
 
diff --git a/lightsoff/src/lightsoff.vala b/lightsoff/src/lightsoff.vala
index 2dc4f7a..d97a54c 100644
--- a/lightsoff/src/lightsoff.vala
+++ b/lightsoff/src/lightsoff.vala
@@ -138,7 +138,7 @@ public class LightsOff : Gtk.Application
             null
         };
         
-        var license = "Lights Off is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nLights Off is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Lights Off; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";        
+        var license = "Lights Off is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nLights Off is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Lights Off; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
 
         Gtk.show_about_dialog (window,
                                "program-name", _("Lights Off"),
diff --git a/quadrapassel/src/quadrapassel.vala b/quadrapassel/src/quadrapassel.vala
index 70528ce..f343a72 100644
--- a/quadrapassel/src/quadrapassel.vala
+++ b/quadrapassel/src/quadrapassel.vala
@@ -685,13 +685,14 @@ public class Quadrapassel : Gtk.Application
     {
         string[] authors = { "Gnome Games Team", null };
         string[] documenters = { "Angela Boyle", null };
+        var license = "Quadrapassel is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nQuadrapassel is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Quadrapassel; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
 
         Gtk.show_about_dialog (window,
                                "program-name", _("Quadrapassel"),
                                "version", VERSION,
                                "comments", _("A classic game of fitting falling blocks together.\n\nQuadrapassel is a part of GNOME Games."),
                                "copyright", "Copyright \xc2\xa9 1999 J. Marcin Gorycki, 2000-2009 Others",
-                               "license", GnomeGamesSupport.get_license (_("Quadrapassel")),
+                               "license", license,
                                "website-label", _("GNOME Games web site"),
                                "authors", authors,
                                "documenters", documenters,
diff --git a/swell-foop/src/swell-foop.vala b/swell-foop/src/swell-foop.vala
index 253ab44..b4bb76e 100644
--- a/swell-foop/src/swell-foop.vala
+++ b/swell-foop/src/swell-foop.vala
@@ -380,13 +380,15 @@ public class SwellFoop : Gtk.Application
         string[] artists = { "Tim Horton", null };
         string[] documenters = { null };
 
+        var license = "Swell Foop is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nSwell Foop is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with Swell Foop; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA";
+
         Gtk.show_about_dialog (main_window,
                                "program-name", _("Swell Foop"),
                                "version", VERSION,
                                "comments",
                                _("I want to play that game! You know, they all light-up and you click on them and they vanish!\n\nSwell Foop is a part of GNOME Games."),
                                "copyright", _("Copyright \xc2\xa9 2009 Tim Horton"),
-                               "license", GnomeGamesSupport.get_license (_("Swell Foop")),
+                               "license", license,
                                "wrap-license", true,
                                "authors", authors,
                                "artists", artists,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]