diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
| commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
| tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /shell | |
| parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
| download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.bz2 gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.lz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.xz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip | |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/main.c | 19 |
2 files changed, 24 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4ba417f5d8..307de5bf79 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2008-11-07 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #557581 + + * main.c: + Replace DEVELOPMENT with STABLE_VERSION, which actually defines + the latest stable version (e.g. 2.24). STABLE_VERSION is only + defined if the current version is _unstable_ (e.g. 2.25). + + * main.c (show_development_warning): + Use STABLE_VERSION instead of hard-coding the version number. + 2008-10-30 Matthew Barnes <mbarnes@redhat.com> * importer/evolution-importer-client.h: diff --git a/shell/main.c b/shell/main.c index 47400798ab..32efec4bd5 100644 --- a/shell/main.c +++ b/shell/main.c @@ -84,12 +84,17 @@ #define SKIP_WARNING_DIALOG_KEY \ "/apps/evolution/shell/skip_warning_dialog" +/* STABLE_VERSION is only defined for development versions. */ +#ifdef STABLE_VERSION +#define DEVELOPMENT 1 +#endif + /* Command-line options. */ static gboolean start_online = FALSE; static gboolean start_offline = FALSE; static gboolean setup_only = FALSE; static gboolean force_shutdown = FALSE; -#if DEVELOPMENT +#ifdef DEVELOPMENT static gboolean force_migrate = FALSE; #endif static gboolean disable_eplugin = FALSE; @@ -163,7 +168,7 @@ kill_old_dataserver (void) #endif -#if DEVELOPMENT +#ifdef DEVELOPMENT /* Warning dialog to scare people off a little bit. */ @@ -211,7 +216,7 @@ show_development_warning(void) "\n" "We hope that you enjoy the results of our hard work, and we\n" "eagerly await your contributions!\n"), - "2.22.1"); + STABLE_VERSION); label = gtk_label_new (text); g_free(text); @@ -394,7 +399,7 @@ static const GOptionEntry options[] = { { "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &force_shutdown, N_("Forcibly shut down all Evolution components"), NULL }, #endif -#if DEVELOPMENT +#ifdef DEVELOPMENT { "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, N_("Forcibly re-migrate from Evolution 1.4"), NULL }, #endif @@ -543,7 +548,7 @@ main (int argc, char **argv) #endif GConfClient *client; -#if DEVELOPMENT +#ifdef DEVELOPMENT gboolean skip_warning_dialog; #endif GnomeProgram *program; @@ -601,7 +606,7 @@ main (int argc, char **argv) client = gconf_client_get_default (); -#if DEVELOPMENT +#ifdef DEVELOPMENT if (force_migrate) destroy_config (client); #endif @@ -651,7 +656,7 @@ main (int argc, char **argv) e_plugin_load_plugins (); } -#if DEVELOPMENT +#ifdef DEVELOPMENT skip_warning_dialog = gconf_client_get_bool ( client, SKIP_WARNING_DIALOG_KEY, NULL); |