aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-03-07 00:53:31 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-03-07 00:53:31 +0800
commit42261b4c8ab857c4957821773ef20dde477f20f9 (patch)
treeecf5d5c8ce0eae3f9a0002629ea982e2152dba1f
parent1f0f6705804f7a5f1e4e601fb0b91331485bb4cd (diff)
downloadgsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar.gz
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar.bz2
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar.lz
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar.xz
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.tar.zst
gsoc2013-evolution-42261b4c8ab857c4957821773ef20dde477f20f9.zip
[Patch from Not Zed <NotZed@Ximian.com>]
(show_development_warning): Separated the current stable version number from the warning prompt, and fixed a minor grammatical error. For bug #38775. svn path=/trunk/; revision=20196
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/main.c19
2 files changed, 20 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 58b66e1e1b..7daee809e4 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,13 @@
2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+ Patch from Not Zed <NotZed@Ximian.com>:
+
+ * main.c (show_development_warning): Separated the current stable
+ version number from the warning prompt, and fixed a minor
+ grammatical error. For bug #38775.
+
+2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+
* e-config-upgrade.c (import_bonobo_config): Protect from val
being NULL when printf()ing -- should fix #39096 (Solaris-specific
crash).
diff --git a/shell/main.c b/shell/main.c
index 6f6bade856..e9e9718820 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -196,6 +196,7 @@ show_development_warning (GtkWindow *parent)
GtkWidget *dont_bother_me_again_checkbox;
GtkWidget *alignment;
GConfClient *client;
+ char *text;
client = gconf_client_get_default ();
@@ -209,24 +210,28 @@ show_development_warning (GtkWindow *parent)
warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
- label = gtk_label_new (
+ text = g_strdup_printf(
/* xgettext:no-c-format */
+ /* Preview/Alpha/Beta version warning message */
_("Hi. Thanks for taking the time to download this preview release\n"
"of the Ximian Evolution groupware suite.\n"
"\n"
- "This version of Ximian Evolution is not yet complete. It's getting close,\n"
- "but some features are either unfinished or don't work properly.\n"
+ "This version of Ximian Evolution is not yet complete. It is getting close,\n"
+ "but some features are either unfinished or do not work properly.\n"
"\n"
- "If you want a stable version of Evolution, we urge you to uninstall,\n"
- "this version, and install a 1.2.x version instead (1.2.2)\n"
+ "If you want a stable version of Evolution, we urge you to uninstall\n"
+ "this version, and install version %s instead.\n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
"This product comes with no warranty and is not intended for\n"
"individuals prone to violent fits of anger.\n"
"\n"
"We hope that you enjoy the results of our hard work, and we\n"
- "eagerly await your contributions!\n"
- ));
+ "eagerly await your contributions!\n"),
+ "1.2.x (1.2.2)");
+ label = gtk_label_new (text);
+ g_free(text);
+
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),