[evolution-patches] Development Warning Patch

[JP Rosevear <jpr novell com>]

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? shell/33287.patch
? shell/corrections.text
? shell/display.patch
? shell/evolution-old
? shell/shell-wizard.patch
? shell/tmp.patch
? shell/wizard-shell.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1445.2.1
diff -u -r1.1445.2.1 ChangeLog
--- ChangeLog	8 Mar 2005 05:56:20 -0000	1.1445.2.1
+++ ChangeLog	15 Mar 2005 19:13:34 -0000
@@ -1,3 +1,7 @@
+2005-03-15  JP Rosevear  <jpr novell com>
+
+	* configure.in: define development as 0
+
 2005-03-07  JP Rosevear  <jpr novell com>
 
 	* configure.in: bump version, requires
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.789.2.1
diff -u -r1.789.2.1 configure.in
--- configure.in	8 Mar 2005 05:56:20 -0000	1.789.2.1
+++ configure.in	15 Mar 2005 19:13:35 -0000
@@ -45,7 +45,7 @@
 dnl
 dnl This should be set to 0 for stable releases and 1 for unstable releases
 dnl *************************************************************************************************
-AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not])
+AC_DEFINE(DEVELOPMENT, 0, [If we are in development mode or not])
 AC_SUBST(DEVELOPMENT)
 
 AC_ISC_POSIX
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1502
diff -u -r1.1502 ChangeLog
--- shell/ChangeLog	1 Mar 2005 06:17:20 -0000	1.1502
+++ shell/ChangeLog	15 Mar 2005 19:13:36 -0000
@@ -1,3 +1,8 @@
+2005-03-15  JP Rosevear  <jpr novell com>
+
+	* main.c: switch #ifdef DEVELOPMENT to #if DEVELOPMENT so the
+	configure.in foo actually controls this
+
 2005-02-28  JP Rosevear  <jpr novell com>
 
 	* e-shell-window-commands.c (command_submit_bug): update authors
Index: shell/main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.166
diff -u -r1.166 main.c
--- shell/main.c	23 Feb 2005 18:56:59 -0000	1.166
+++ shell/main.c	15 Mar 2005 19:13:36 -0000
@@ -89,10 +89,6 @@
 #include "e-util/e-plugin-mono.h"
 #endif
 
-#ifndef DEVELOPMENT
-#define DEVELOPMENT (1)
-#endif
-
 static EShell *shell = NULL;
 
 /* Command-line options.  */
@@ -100,7 +96,7 @@
 static gboolean start_offline = FALSE;
 static gboolean setup_only = FALSE;
 static gboolean killev = FALSE;
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 static gboolean force_migrate = FALSE;
 #endif
 #ifdef ENABLE_MONO
@@ -182,7 +178,7 @@
 #endif
 
 
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 
 /* Warning dialog to scare people off a little bit.  */
 
@@ -480,7 +476,7 @@
 		{ "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, 
 		  N_("Forcibly shut down all Evolution components"), NULL },
 #endif
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 		{ "force-migrate", '\0', POPT_ARG_NONE, &force_migrate, 0, 
 		  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
 #endif
@@ -496,7 +492,7 @@
 		  &setup_only, 0, NULL, NULL },
 		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 	};
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 	GConfClient *client;
 	gboolean skip_warning_dialog;
 #endif
@@ -533,7 +529,7 @@
 		exit (0);
 	}
 
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 	if (force_migrate) {
 		destroy_config ();
 	}
@@ -600,7 +596,7 @@
 		e_plugin_load_plugins();
 	}
 
-#ifdef DEVELOPMENT
+#if DEVELOPMENT
 	client = gconf_client_get_default ();
 	skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL);
 	g_object_unref (client);