diff options
author | John Harper <jsh@eazel.com> | 2001-03-09 01:15:55 +0000 |
---|---|---|
committer | John Harper <jsh@src.gnome.org> | 2001-03-09 01:15:55 +0000 |
commit | 812d5fc58bcc25d4405f6e2d20f5403a5cfd69f3 (patch) | |
tree | c1b92df52a2d53a2a59e2e52f2ac3afadfe3d178 | |
parent | 8c2bc3eef76ba9d43c2bc0c304d64a0363f8e9f2 (diff) | |
download | nautilus-812d5fc58bcc25d4405f6e2d20f5403a5cfd69f3.tar.gz |
Merge from HEAD:
2001-03-08 John Harper <jsh@eazel.com>
Merge from HEAD:
2001-03-08 John Harper <jsh@eazel.com>
reviewed by: Seth Nickell <seth@eazel.com>
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
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | src/nautilus-first-time-druid.c | 4 |
2 files changed, 18 insertions, 0 deletions
@@ -4,6 +4,20 @@ 2001-03-08 John Harper <jsh@eazel.com> + reviewed by: Seth Nickell <seth@eazel.com> + + 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 <jsh@eazel.com> + + Merge from HEAD: + + 2001-03-08 John Harper <jsh@eazel.com> + reviewed by: Robin * Slomkowski <rslomkow@eazel.com> Fixed bug 7550 (SOLARIS: text drawn incorrectly in anti-aliased 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); } |