diff -Nru xorg-7.4~5ubuntu3/debian/changelog xorg-7.4~5ubuntu3.1/debian/changelog
--- xorg-7.4~5ubuntu3/debian/changelog	2008-10-23 09:40:24.000000000 -0400
+++ xorg-7.4~5ubuntu3.1/debian/changelog	2009-02-16 04:37:45.000000000 -0500
@@ -1,3 +1,9 @@
+xorg (1:7.4~5ubuntu3.1) intrepid-proposed; urgency=low
+
+  * failsafeXinit: remove options that run gedit as root.  (LP: #310126)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Mon, 16 Feb 2009 04:35:21 -0500
+
 xorg (1:7.4~5ubuntu3) intrepid; urgency=low
 
   * debian/control:
diff -Nru xorg-7.4~5ubuntu3/debian/local/Failsafe/failsafeXinit xorg-7.4~5ubuntu3.1/debian/local/Failsafe/failsafeXinit
--- xorg-7.4~5ubuntu3/debian/local/Failsafe/failsafeXinit	2008-10-23 09:40:24.000000000 -0400
+++ xorg-7.4~5ubuntu3.1/debian/local/Failsafe/failsafeXinit	2009-02-16 04:36:19.000000000 -0500
@@ -72,10 +72,7 @@
         --text "What information would you like to review?" \
         --width $app_width --height $app_height \
         --column "" --column "Choice" --column "" \
-          TRUE   VIEW_XORG_LOG "Review the xserver log file" \
-          FALSE  VIEW_GDM_LOG  "Review the startup errors" \
-          FALSE  EDIT_CONFIG   "Edit configuration file" \
-          FALSE  SAVE_CONFIG_LOGS   "Archive configuration and logs" \
+          TRUE   SAVE_CONFIG_LOGS   "Archive configuration and logs" \
         --hide-column 2
 # TODO:          5 VERIFY_XORGCONF "Check configuration file"
 # TODO:          6 EXIT_TO_CONSOLE "Exit to console" \
@@ -128,25 +125,11 @@
     fi
 }
 
-view_xorg_log() {
-    gedit $xorg_log
-}
-
-view_gdm_log() {
-    gedit $gdm_log
-}
-
 verify_xorgconf() {
     # Run Alberto's xorg.conf checker (once it's available in main)
     zenity --error --text "Sorry, this option is not implemented yet"
 }
 
-edit_config() {
-    backup_xorg_conf || return 1
-
-    gksu gedit "/etc/X11/xorg.conf"
-}
-
 save_config_logs() {
     xorg_backup_name=failsafeX-backup-${timestamp}
     xorg_backup_dir=$(mktemp -d -t ${xorg_backup_name}.XXX)
@@ -187,10 +170,7 @@
         SELECT_BACKUP )   choice="RECONFIGURE"; ;;
 
         ## Troubleshooting Menu ##
-        VIEW_XORG_LOG )   choice="TROUBLESHOOT"; view_xorg_log ;;
-        VIEW_GDM_LOG )    choice="TROUBLESHOOT"; view_gdm_log ;;
         VERIFY_XORGCONF ) choice="TROUBLESHOOT"; verify_xorgconf ;;
-        EDIT_CONFIG )     choice="TROUBLESHOOT"; edit_config ;;
         SAVE_CONFIG_LOGS ) choice="TROUBLESHOOT"; save_config_logs ;;
         EXIT_TO_CONSOLE ) with_gdm=""; break ;;