Index: libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.194
diff -u -r1.194 gnome-ui-init.c
--- libgnomeui/gnome-ui-init.c	15 Feb 2004 20:43:59 -0000	1.194
+++ libgnomeui/gnome-ui-init.c	9 Apr 2004 00:11:52 -0000
@@ -88,8 +88,7 @@
 					 GnomeModuleInfo *mod_info);
 static void libgnomeui_rc_parse		(GnomeProgram *program,
 					 const gchar *command);
-static void libgnomeui_segv_setup	(GnomeProgram *program,
-					 gboolean post_arg_parse);
+static void libgnomeui_segv_setup	(GnomeProgram *program);
 
 /* Prototype for a private gnome_stock function */
 void _gnome_stock_icons_init (void);
@@ -278,19 +277,17 @@
 static void
 libgnomeui_pre_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info)
 {
+// scottt: envar overrides libgnomeui default, command line arg overrides envar
         gboolean do_crash_dialog = TRUE;
         const char *envar;
 
         envar = g_getenv("GNOME_DISABLE_CRASH_DIALOG");
-        if(envar)
+        if(envar) {
                 do_crash_dialog = atoi(envar)?FALSE:TRUE;
-	if ( ! do_crash_dialog)
 		g_object_set (G_OBJECT(app),
-			      LIBGNOMEUI_PARAM_CRASH_DIALOG, FALSE,
+			      LIBGNOMEUI_PARAM_CRASH_DIALOG, do_crash_dialog,
 			      NULL);
-
-        if(do_crash_dialog)
-                libgnomeui_segv_setup (app, FALSE);
+	}
 }
 
 #ifdef HAVE_ESD
@@ -537,7 +534,7 @@
         gnome_type_init();
         libgnomeui_rc_parse (program, g_get_prgname ());
 
-        libgnomeui_segv_setup (program, TRUE);
+        libgnomeui_segv_setup (program);
 
         priv = g_object_get_qdata(G_OBJECT(program), quark_gnome_program_private_libgnomeui);
         priv->constructed = TRUE;
@@ -663,7 +660,7 @@
 static void libgnomeui_segv_handle(int signum);
 
 static void
-libgnomeui_segv_setup (GnomeProgram *program, gboolean post_arg_parse)
+libgnomeui_segv_setup (GnomeProgram *program)
 {
         static struct sigaction *setptr;
         struct sigaction sa;
