[anjuta] Miscellaneous improvements to the About dialog



commit f753c519d2accff754f4b35d2faa2c102a0215f6
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Mar 17 22:15:18 2014 -0500

    Miscellaneous improvements to the About dialog
    
    * Reduce the width of the Credits page
    * Use GtkLicense
    * Use the correct copyright sign. (It can be omitted, but we shouldn't
      display (c) in our programs.)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=726606

 AUTHORS     |   39 ++++++++++++++++++++-------------------
 src/about.c |   22 +++-------------------
 2 files changed, 23 insertions(+), 38 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 7f6ead6..7d76973 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,27 +1,27 @@
 Founder and former lead Developer:
--------------------------------------------------------------------------------
+----------------------------------------
        Naba kumar  <naba gnome org> (Manipur, India)
 
 Maintainers and Lead Developers:
--------------------------------------------------------------------------------
+----------------------------------------
        Johannes Schmid  <jhs gnome org> (Germany)
        Sebastien Granjoux  <seb sfo free fr> (France)
        James Liggett  <jrliggett cox net> (U.S.)
        
 Developers:
--------------------------------------------------------------------------------
+----------------------------------------
        Massimo Cora'  <maxcvs email it> (Italy)
        Carl-Anton Ingmarsson <carlantoni gnome org> (Sweden)
        
 Past Developers:
--------------------------------------------------------------------------------
+----------------------------------------
        Andy Piper  <andy piper freeuk com> (United Kingdom)
        Biswapesh Chattopadhyay  <biswapesh_chatterjee tcscal co in> (Kolkata, India)
        Jean-Noel Guiheneuf  <guiheneuf jean-noel wanadoo fr> (France)
        Stéphane Démurget  <demurgets free fr> (France)
        
 GNOME Build Developers:
--------------------------------------------------------------------------------
+----------------------------------------
        JP Rosevear  <jpr helixcode com> (USA)
        Dave Camp  <dave helixcode com> (USA)
        Jeroen Zwartepoorte  <jeroen xs4all nl> (United Kingdom)
@@ -29,24 +29,24 @@ GNOME Build Developers:
        Naba kumar  <naba gnome org> (Manipur, India)
        
 GDL Developers:
--------------------------------------------------------------------------------
+----------------------------------------
        Dave Camp  <dave ximian com> (USA)
        Gustavo Giráldez  <gustavo_giraldez gmx net> (Argentina)
        
 Scintilla Developer:
--------------------------------------------------------------------------------
+----------------------------------------
        Neil Hodgson  <neilh scintilla org>
        
 Website:
--------------------------------------------------------------------------------
+----------------------------------------
        Naba kumar  <naba gnome org> (Manipur, India)
        
 Artwork for Symbol Database
--------------------------------------------------------------------------------
+----------------------------------------
        Vinicius Depizzol <vdepizzol gmail com>
        
 Contributors:
--------------------------------------------------------------------------------
+----------------------------------------
        Adam Dingle  <adam medovina org>
        Alexander Korolyov <kilork yandex ru>
        Antoine Cailliau  <a cailliau ac-graphic net>
@@ -124,18 +124,18 @@ Contributors:
        Vadim Berezniker  <vadim berezniker com>
        Venugopal Gummuluru  <vgummuluru yahoo com>
        Vincent Geddes <vgeddes gnome org>
-       Willy-Francois Poulet - Byssus Software Solutions  <wfp byssus com> (England)
+       Willy-Francois Poulet <wfp byssus com> (England)
        Yang Hong  <yanghong ccoss com cn>
        Yannick Koehler  <yannick koehler colubris com>
        
 Documenters:
--------------------------------------------------------------------------------
+----------------------------------------
        Naba Kumar <naba gnome org> (Manipur, India)
        Andy Piper <andy piper freeuk com> (England)
        Biswapesh Chattopadhyay <Biswapesh Chattopadhyay>       
        
 Main Translators:
--------------------------------------------------------------------------------
+----------------------------------------
        zh_TW   Abel Cheung <maddog linux org hk>
        en_CA   Adam Weinberger <adamw gnome org>
        ga              Alastair McKinstry <mckinstry computer org>
@@ -195,14 +195,15 @@ Main Translators:
        oc              Yannig Marchegay <yannig marchegay org>
 
 Note: 
--------------------------------------------------------------------------------
-If you have contributed something significant to Anjuta 
-and your name is missing here, please email naba gnome org 
-with your Full name, email address, country and a brief 
-reminder of what you have done.
+----------------------------------------
+If you have contributed something significant to
+Anjuta and your name is missing here, please email
+naba gnome org with your Full name, email
+address, country and a brief reminder of what you
+have done.
 
 Format :
--------------------------------------------------------------------------------
+----------------------------------------
 In order to parse AUTHORS files some rules must be followed :
 
 1 - Each first chapter line must end by ':'
diff --git a/src/about.c b/src/about.c
index 080821c..ce08781 100644
--- a/src/about.c
+++ b/src/about.c
@@ -28,8 +28,6 @@
 
 #include "about.h"
 
-#define LICENSE_FILE PACKAGE_DOC_DIR "/COPYING"
-
 #define ANJUTA_PIXMAP_LOGO                     "anjuta_logo.png"
 #define ABOUT_AUTHORS                          "AUTHORS"
 #define MAX_CAR 256
@@ -173,24 +171,11 @@ GtkWidget *
 about_box_new (GtkWindow *parent)
 {
        GtkWidget *dialog;
-       gchar* license = NULL;
        GError* error = NULL;
 
        /*  Parse AUTHORS file  */
        about_read_file();
 
-
-       if (!g_file_get_contents (LICENSE_FILE,
-                                 &license,
-                                 NULL,
-                                 &error))
-       {
-               g_warning ("Couldn't read license file %s: %s",
-                           LICENSE_FILE,
-                           error->message);
-               g_error_free (error);
-       }
-
        dialog = gtk_about_dialog_new();
        gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
        gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
@@ -198,11 +183,11 @@ about_box_new (GtkWindow *parent)
        gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), "Anjuta");
        gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION);
        gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
-               _("Copyright (c) Naba Kumar"));
+               _("Copyright © Naba Kumar"));
        gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog),
                _("Integrated Development Environment"));
-       gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(dialog),
-               license);
+       gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(dialog),
+               GTK_LICENSE_GPL_2_0);
        gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog), "http://www.anjuta.org";);
        gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(dialog), "anjuta");
 
@@ -213,7 +198,6 @@ about_box_new (GtkWindow *parent)
        gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(dialog), ???);*/
        /* Free authors, documenters, translators */
        about_free_credit();
-       g_free (license);
        return dialog;
 }
 


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