From e3b9f2165d0f0b0e64332c8a0643a92453f4e217 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Wed, 15 Dec 2010 15:51:27 +0000 Subject: [PATCH] Set the license type instead of the license text. https://bugzilla.gnome.org/show_bug.cgi?id=637316 --- src/empathy-about-dialog.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c index bd6b2f86..163bd5cb 100644 --- a/src/empathy-about-dialog.c +++ b/src/empathy-about-dialog.c @@ -73,37 +73,14 @@ static const char *artists[] = { NULL }; -static const char *license[] = { - N_("Empathy 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_("Empathy 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 Empathy; if not, write to the Free Software Foundation, Inc., " - "51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"), - NULL -}; - void empathy_about_dialog_new (GtkWindow *parent) { - GString *license_trans = g_string_new (NULL); - int i; - - for (i = 0; license[i] != NULL; i++) { - g_string_append (license_trans, _(license[i])); - g_string_append (license_trans, "\n\n"); - - } gtk_show_about_dialog (parent, "artists", artists, "authors", authors, "comments", _("An Instant Messaging client for GNOME"), - "license", license_trans->str, + "license-type", GTK_LICENSE_GPL_2_0, "wrap-license", TRUE, "copyright", "Imendio AB 2002-2007\nCollabora Ltd 2007-2011", "documenters", documenters, @@ -112,8 +89,4 @@ empathy_about_dialog_new (GtkWindow *parent) "version", PACKAGE_VERSION, "website", WEB_SITE, NULL); - - g_string_free (license_trans, TRUE); } - - -- 2.39.2