[gnome-hello] Use the predefined license string



commit 61e4d419ff91f244a0e181867d0b627eeae742fc
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Feb 6 18:32:44 2011 +0000

    Use the predefined license string

 src/menus.c |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)
---
diff --git a/src/menus.c b/src/menus.c
index 4777fd0..8d34091 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -176,7 +176,6 @@ static void
 about_action_callback (GtkAction* action, gpointer data)
 {
   GtkWindow *app = GTK_WINDOW (data);
-  gchar *license_translated;
 
   const gchar *authors[] = {
     "Havoc Pennington <hp pobox com>",
@@ -191,39 +190,18 @@ about_action_callback (GtkAction* action, gpointer data)
     NULL
   };
 
-  const gchar *license[] = {
-    N_("Thi program 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_("This program 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_("You should have received a copy of the GNU General Public License "
-       "along with this program; if not, write to the Free Software Foundation, Inc., "
-       "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA")
-  };
-  license_translated = g_strjoin ("\n\n",
-                                  _(license[0]),
-                                  _(license[1]),
-                                  _(license[2]),
-                                  NULL);
-
   gtk_show_about_dialog (app,
                          "authors", authors,
                          "comments", _("Sample application using GNOME technologies"),
                          "copyright", _(copyright),
                          "documenters", documentation_credits,
-                         "license", license_translated,
+                         "license-type", GTK_LICENSE_GPL_2_0,
                          "logo-icon-name", "gnome-hello-logo",
                          "title", _("About GNOME Hello"),
                          "translator-credits", _("translator-credits"),
                          "version", PACKAGE_VERSION,
                          "wrap-license", TRUE,
                          NULL);
-
-  g_free (license_translated);
 }
 
 GtkUIManager *



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