Re: [evolution-patches] Patch to remove the development warning at startup

[Ettore Perazzoli <ettore ximian com>]

Point taken.

On Mon, 2003-05-19 at 11:03, Mike Kestner wrote:
> looks fine, but if the code will be coming right back after we branch
> 1.4, maybe a #if solution would make it easier to bring back?
> 
> On Sun, 2003-05-18 at 17:37, Ettore Perazzoli wrote:
> > -- Ettore
> 
> > +2003-05-18  Ettore Perazzoli  <ettore ximian com>
> > +
> > +	* main.c (show_development_warning): Removed.
> > +	(warning_dialog_response_callback): Removed.
> > +	(view_map_callback): Removed.
> > +	(new_view_created_callback): Removed.
> > +	(idle_cb): Do not connect new_view_created_callback() to the
> > +	"new_view" shell signal anymore.
> 
> 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1276
diff -u -p -r1.1276 ChangeLog
--- ChangeLog	18 May 2003 00:48:03 -0000	1.1276
+++ ChangeLog	19 May 2003 15:21:27 -0000
@@ -1,3 +1,28 @@
+2003-05-19  Ettore Perazzoli  <ettore ximian com>
+
+	* main.c: Removed "forced_upgrade" unused variable.
+	(show_development_warning): Put in a DEVELOPMENT_WARNING cpp
+	conditional.
+	(warning_dialog_response_callback): Likewise.
+	(view_map_callback): Likewise.
+	(new_view_created_callback): Likewise.
+	(idle_cb) [DEVELOPMENT_WARNING]: Do not connect
+	new_view_created_callback() to the "new_view" shell signal
+	anymore.
+
+2003-05-18  Ettore Perazzoli  <ettore ximian com>
+
+	* Makefile.am (install-evolution) [DEFAULT_BINARY]: Make a
+	symbolic link from evolution to evolution-$(BASE_VERSION).
+
+2003-05-17  Ettore Perazzoli  <ettore ximian com>
+
+	[#43216]
+
+	* e-shell-folder-creation-dialog.c (dialog_data_destroy):
+	g_object_weak_unref shell and dialog if they are not NULL.
+	(dialog_destroy_notify): Set ->dialog to NULL in all cases.
+
 2003-05-17  Ettore Perazzoli  <ettore ximian com>
 
 	* e-storage-set-view.c (e_storage_set_view_set_show_checkboxes):
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.122
diff -u -p -r1.122 main.c
--- main.c	15 May 2003 15:57:34 -0000	1.122
+++ main.c	19 May 2003 15:21:27 -0000
@@ -86,7 +86,6 @@ static char *evolution_directory = NULL;
 static gboolean no_splash = FALSE;
 static gboolean start_online = FALSE;
 static gboolean start_offline = FALSE;
-static gboolean force_upgrade = FALSE;
 static gboolean setup_only = FALSE;
 static gboolean killev = FALSE;
 
@@ -224,6 +223,8 @@ kill_old_wombat (void)
 #endif
 
 
+#ifdef DEVELOPMENT_WARNING
+
 /* Warning dialog to scare people off a little bit.  */
 
 static void
@@ -340,6 +341,8 @@ new_view_created_callback (EShell *shell
 	g_signal_connect (view, "map", G_CALLBACK (view_map_callback), NULL);
 }
 
+#endif /* DEVELOPMENT_WARNING */
+
 
 /* This is for doing stuff that requires the GTK+ loop to be running already.  */
 
@@ -381,9 +384,11 @@ idle_cb (void *data)
 		g_signal_connect (shell, "no_views_left", G_CALLBACK (no_views_left_cb), NULL);
 		g_object_weak_ref (G_OBJECT (shell), shell_weak_notify, NULL);
 
+#ifdef DEVELOPMENT_WARNING
 		if (!getenv ("EVOLVE_ME_HARDER"))
 			g_signal_connect (shell, "new_view_created",
 					  G_CALLBACK (new_view_created_callback), NULL);
+#endif
 
 		corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
 		corba_shell = CORBA_Object_duplicate (corba_shell, &ev);
@@ -545,10 +550,6 @@ main (int argc, char **argv)
 #endif
 		{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, 
 		  N_("Send the debugging output of all components to a file."), NULL },
-#if 0
-		{ "force-upgrade", '\0', POPT_ARG_NONE, &force_upgrade, 0, 
-		  N_("Force upgrading of configuration files from Evolution 1.0.x"), NULL },
-#endif
 		{ "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN,
 		  &setup_only, 0, NULL, NULL },
 		POPT_AUTOHELP