[eog] Use the new license-type property in GtkAboutDialog



commit f8704ad41fc4f75aaf489c55e121103b77861ccb
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Thu Aug 12 02:13:38 2010 +0300

    Use the new license-type property in GtkAboutDialog
    
    Bump the GTK+ version requirement for this.

 configure.ac     |    2 +-
 src/eog-window.c |   23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 28beaaf..6e19d10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ GNOME_DOC_INIT
 # GNOME Libs
 # **********
 
-GTK_REQUIRED=2.90.4
+GTK_REQUIRED=2.90.6
 GLIB_REQUIRED=2.25.9
 GNOME_DESKTOP_REQUIRED=2.90.4
 GDKPIXBUF_REQUIRED=2.4.0
diff --git a/src/eog-window.c b/src/eog-window.c
index b99a780..4ff90a3 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -2441,25 +2441,6 @@ eog_window_cmd_about (GtkAction *action, gpointer user_data)
 
 	translators = _("translator-credits");
 
-	const char *license[] = {
-		N_("This 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"),
-		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"),
-		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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.")
-	};
-
-	char *license_trans;
-
-	license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
-				     _(license[2]), "\n", NULL);
-
 	window = EOG_WINDOW (user_data);
 
 	gtk_show_about_dialog (GTK_WINDOW (window),
@@ -2473,10 +2454,8 @@ eog_window_cmd_about (GtkAction *action, gpointer user_data)
 			       "website", "http://projects.gnome.org/eog/";,
 			       "logo-icon-name", "eog",
 			       "wrap-license", TRUE,
-			       "license", license_trans,
+			       "license-type", GTK_LICENSE_GPL_2_0,
 			       NULL);
-
-	g_free (license_trans);
 }
 
 static void



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