From 812d5fc58bcc25d4405f6e2d20f5403a5cfd69f3 Mon Sep 17 00:00:00 2001 From: John Harper Date: Fri, 9 Mar 2001 01:15:55 +0000 Subject: Merge from HEAD: 2001-03-08 John Harper Merge from HEAD: 2001-03-08 John Harper reviewed by: Seth Nickell Fixed bug 7557 (Nautilus does not automatically start on GNOME startup after installation): * src/nautilus-first-time-druid.c (set_up_gmc_transition_page): don't display the `add nautilus to session' option --- ChangeLog | 14 ++++++++++++++ src/nautilus-first-time-druid.c | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index f2fa4eced..f626d20f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2001-03-08 John Harper + + Merge from HEAD: + + 2001-03-08 John Harper + + reviewed by: Seth Nickell + + Fixed bug 7557 (Nautilus does not automatically start on GNOME + startup after installation): + + * src/nautilus-first-time-druid.c (set_up_gmc_transition_page): + don't display the `add nautilus to session' option + 2001-03-08 John Harper Merge from HEAD: diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c index 850fbd9c9..70e6ef5d3 100644 --- a/src/nautilus-first-time-druid.c +++ b/src/nautilus-first-time-druid.c @@ -921,10 +921,14 @@ set_up_gmc_transition_page (NautilusDruidPageEazel *page) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), transfer_gmc_icons); gtk_signal_connect (GTK_OBJECT (checkbox), "toggled", GTK_SIGNAL_FUNC (transition_value_changed), &transfer_gmc_icons); +#if 0 + /* This option is currently disabled, per bugzilla.eazel.com 7557 */ + checkbox = gtk_check_button_new_with_label (_("Launch Nautilus when GNOME starts up.")); gtk_box_pack_start (GTK_BOX (main_box), checkbox, FALSE, FALSE, 0); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), add_to_session); gtk_signal_connect (GTK_OBJECT (checkbox), "toggled", GTK_SIGNAL_FUNC (transition_value_changed), &add_to_session); +#endif gtk_widget_show_all (main_box); } -- cgit v1.2.1