diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-02-10 18:21:02 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-02-10 18:21:02 +0800 |
| commit | 683037c4316fd620863262ca1f3d0e57d9028f8b (patch) | |
| tree | 5f7cd7bca74b9606c53e36136d096990cc124367 /shell | |
| parent | c1488e33dad8e49826a30e056282926f15f13537 (diff) | |
| download | gsoc2013-evolution-683037c4316fd620863262ca1f3d0e57d9028f8b.tar.gz gsoc2013-evolution-683037c4316fd620863262ca1f3d0e57d9028f8b.tar.zst gsoc2013-evolution-683037c4316fd620863262ca1f3d0e57d9028f8b.zip | |
Merge from the stable branch: display the `SUB_VERSION' in the about
box as well.
svn path=/trunk/; revision=8159
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 75 |
2 files changed, 49 insertions, 32 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 81eeead46f..aa60be8290 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2001-02-10 Ettore Perazzoli <ettore@ximian.com> + + * e-shell-view-menu.c: Moved the author list to the top of the + file. + (command_about_box): Display the `SUB_VERSION' as well. + 2001-02-08 Ettore Perazzoli <ettore@ximian.com> * e-shell-folder-creation-dialog.c (dialog_clicked_cb): Destroy diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 30b184b2ae..dbfcb42217 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -38,6 +38,38 @@ #include <bonobo.h> +const char *authors[] = { + "Seth Alves", + "Anders Carlsson", + "Damon Chaplin", + "Clifford R. Conover", + "Anna Dirks", + "Miguel de Icaza", + "Radek Doulik", + "Arturo Espinoza", + "Larry Ewing", + "Nat Friedman", + "Bertrand Guiheneuf", + "Iain Holmes", + "Tuomas Kuosmanen", + "Christopher J. Lahey", + "Matthew Loper", + "Federico Mena", + "Eskil Heyn Olsen", + "Jesse Pavel", + "Ettore Perazzoli", + "JP Rosevear", + "Jeffrey Stedfast", + "Russell Steinthal", + "Peter Teichman", + "Chris Toshok", + "Peter Williams", + "Dan Winship", + "Michael Zucchi", + NULL +}; + + /* EShellView callbacks. */ static void @@ -147,41 +179,18 @@ command_about_box (BonoboUIComponent *uih, { static GtkWidget *about_box = NULL; - if (about_box) + if (about_box) { gdk_window_raise(GTK_WIDGET(about_box)->window); - else { - const gchar *authors[] = { - "Seth Alves", - "Anders Carlsson", - "Damon Chaplin", - "Clifford R. Conover", - "Anna Dirks", - "Miguel de Icaza", - "Radek Doulik", - "Arturo Espinoza", - "Larry Ewing", - "Nat Friedman", - "Bertrand Guiheneuf", - "Iain Holmes", - "Tuomas Kuosmanen", - "Christopher J. Lahey", - "Matthew Loper", - "Federico Mena", - "Eskil Heyn Olsen", - "Jesse Pavel", - "Ettore Perazzoli", - "JP Rosevear", - "Jeffrey Stedfast", - "Russell Steinthal", - "Peter Teichman", - "Chris Toshok", - "Peter Williams", - "Dan Winship", - "Michael Zucchi", - NULL}; + } else { + char *version; + + if (SUB_VERSION[0] == '\0') + version = g_strdup (VERSION); + else + version = g_strdup_printf ("%s [%s]", VERSION, SUB_VERSION); about_box = gnome_about_new(_("Evolution"), - VERSION, + version, _("Copyright 1999, 2000, 2001 Ximian, Inc."), authors, _("Evolution is a suite of groupware applications\n" @@ -191,6 +200,8 @@ command_about_box (BonoboUIComponent *uih, gtk_signal_connect(GTK_OBJECT(about_box), "destroy", GTK_SIGNAL_FUNC(zero_pointer), &about_box); gtk_widget_show(about_box); + + g_free (version); } } |