[gnome-nibbles] Move to using GTK builtin license, removes one dependency on games-stock



commit bfcdad4b8a1dff791d9a731ae038716a19366b8b
Author: Bryan Quigley <bryanquigs src gnome org>
Date:   Sat Apr 20 14:42:12 2013 -0400

    Move to using GTK builtin license, removes one dependency on games-stock

 src/games-stock.c | 51 ---------------------------------------------------
 src/games-stock.h |  1 -
 src/main.c        | 15 +++++++--------
 3 files changed, 7 insertions(+), 60 deletions(-)
---
diff --git a/src/games-stock.c b/src/games-stock.c
index c61ad8f..bf023b1 100644
--- a/src/games-stock.c
+++ b/src/games-stock.c
@@ -304,54 +304,3 @@ games_stock_init (void)
  
   gtk_stock_add_static (games_stock_items, G_N_ELEMENTS (games_stock_items));
 }
-
-/* Returns a GPL N+ license string for a specific game. */
-static gchar *
-games_get_license_version (const gchar * game_name,
-                           int version)
-{
-  gchar *license_trans, *license_str;
-
-  static const char license0[] =
-    /* %s is replaced with the name of the game in gnome-games. */
-    N_("%s 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 %d of the License, or "
-       "(at your option) any later version.");
-  static const char license1[] =
-    N_("%s 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.");
-  static const char license2[] =
-    N_("You should have received a copy of the GNU General Public License "
-       "along with %s; if not, write to the Free Software Foundation, Inc., "
-       "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA");
-  static const char license3[] =
-    N_("You should have received a copy of the GNU General Public License "
-       "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-
-  if (version >= 3)
-    license_trans = g_strjoin ("\n\n", _(license0), _(license1), _(license3), NULL);
-  else
-    license_trans = g_strjoin ("\n\n", _(license0), _(license1), _(license2), NULL);
-
-  license_str =
-    g_strdup_printf (license_trans, game_name, version, game_name, game_name);
-  g_free (license_trans);
-
-  return license_str;
-}
-
-/**
- * gamess_get_licence:
- *
- * Returns: a newly allocated string with a GPL licence notice. The GPL version used
- *   depends on the game and the configure options and is determined from
- *   games_runtime_get_gpl_version()
- */
-gchar *
-games_get_license (const gchar * game_name)
-{
-  return games_get_license_version (game_name, 2);
-}
diff --git a/src/games-stock.h b/src/games-stock.h
index 8c53854..b355826 100644
--- a/src/games-stock.h
+++ b/src/games-stock.h
@@ -55,7 +55,6 @@ G_BEGIN_DECLS
 void   games_stock_init (void);
 void   games_stock_prepare_for_statusbar_tooltips (GtkUIManager * ui_manager,
                                                    GtkWidget * statusbar);
-gchar *games_get_license (const gchar * game_name);
 
 G_END_DECLS
 
diff --git a/src/main.c b/src/main.c
index ce1713d..8c93808 100644
--- a/src/main.c
+++ b/src/main.c
@@ -152,7 +152,6 @@ about_cb (GtkAction * action, gpointer data)
                              "Guillaume Beland", NULL };
 
   const gchar *documenters[] = { "Kevin Breit", NULL };
-  gchar *license = games_get_license (_("Nibbles"));
 
   gtk_show_about_dialog (GTK_WINDOW (window),
        "program-name", _("Nibbles"),
@@ -160,16 +159,16 @@ about_cb (GtkAction * action, gpointer data)
        "copyright",
        "Copyright \xc2\xa9 1999-2008 Sean MacIsaac, Ian Peters, Andreas Røsdal"
        " 2009 Guillaume Beland",
-       "license", license, "comments",
-       _("A worm game for GNOME.\n\nNibbles is a part of GNOME Games."),
+
+       "license-type", GTK_LICENSE_GPL_2_0, 
+       "comments", _("A worm game for GNOME.\n\nNibbles is a part of GNOME Games."),
        "authors", authors,
-       "documenters", documenters, "translator-credits",
-       _("translator-credits"), "logo-icon-name",
-       "gnome-nibbles", "website",
-       "http://www.gnome.org/projects/gnome-games/";,
+       "documenters", documenters, 
+       "translator-credits", _("translator-credits"), 
+       "logo-icon-name", "gnome-nibbles", 
+       "website", "http://www.gnome.org/projects/gnome-games/";,
        "website-label", _("GNOME Games web site"),
        "wrap-license", TRUE, NULL);
-  g_free (license);
 }
 
 static gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]