--- libgnomeui-2.6.1.1/libgnomeui/gnome-ui-init.c~	2004-08-18 16:50:59.000000000 +0100
+++ libgnomeui-2.6.1.1/libgnomeui/gnome-ui-init.c	2004-08-18 17:02:12.000000000 +0100
@@ -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,16 @@
 static void
 libgnomeui_pre_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info)
 {
-        gboolean do_crash_dialog = TRUE;
         const char *envar;
 
-        envar = g_getenv("GNOME_DISABLE_CRASH_DIALOG");
-        if(envar)
-                do_crash_dialog = atoi(envar)?FALSE:TRUE;
-	if ( ! do_crash_dialog)
-		g_object_set (G_OBJECT(app),
-			      LIBGNOMEUI_PARAM_CRASH_DIALOG, FALSE,
-			      NULL);
-
-        if(do_crash_dialog)
-                libgnomeui_segv_setup (app, FALSE);
+        /* this is one of two places where the crash dialog can be disabled */
+        /* the other is the command line option --disable-crash-dialog, so */
+        /* we wait until post_args_parse before calling libgnomeui_segv_setup */
+        envar = g_getenv ("GNOME_DISABLE_CRASH_DIALOG");
+        if (envar && atoi (envar))
+                g_object_set (G_OBJECT (app),
+                              LIBGNOMEUI_PARAM_CRASH_DIALOG, FALSE,
+                              NULL);
 }
 
 #ifdef HAVE_ESD
@@ -537,7 +533,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 +659,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;