diff options
| -rw-r--r-- | shell/ChangeLog | 6 | ||||
| -rw-r--r-- | shell/main.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 7da02fabf5..9dcf6e4688 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,9 @@ +2004-06-18 Jeffrey Stedfast <fejj@novell.com> + + * main.c (main): Remove AUTOHELP option since GNOME adds this + itself. Fixes bug #60374. + (main): Before exiting from main(), call shutdown() routines. + 2004-06-18 Radek Doulik <rodo@ximian.com> * main.c (main): test for skip_warning_dialog value in gconf here diff --git a/shell/main.c b/shell/main.c index e6a1a4dc70..b06b9b7c33 100644 --- a/shell/main.c +++ b/shell/main.c @@ -475,7 +475,6 @@ main (int argc, char **argv) N_("Send the debugging output of all components to a file."), NULL }, { "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &setup_only, 0, NULL, NULL }, - POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } }; #ifdef DEVELOPMENT @@ -584,6 +583,9 @@ main (int argc, char **argv) bonobo_main (); e_icon_factory_shutdown (); + g_object_unref (program); + gnome_sound_shutdown (); + e_cursors_shutdown (); return 0; } |