diff options
| author | Mike Engber <engber@src.gnome.org> | 2000-12-09 00:18:31 +0000 |
|---|---|---|
| committer | Mike Engber <engber@src.gnome.org> | 2000-12-09 00:18:31 +0000 |
| commit | 76b5dd2512312b1212a3a6d0e44518c1a82bfb32 (patch) | |
| tree | 378fe0f6d69dbf56e576c96e2e7ef815af013082 /src/nautilus-application.c | |
| parent | b31ea1e0209acd943cc54c7c222ebb0031f64fa7 (diff) | |
| download | nautilus-76b5dd2512312b1212a3a6d0e44518c1a82bfb32.tar.gz | |
Remove command line args --start-desktop & --stop-desktop and the "Quit
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_register):
* src/file-manager/fm-desktop-icon-view.c: (real_merge_menus):
* src/file-manager/nautilus-desktop-icon-view-ui.xml:
* src/nautilus-application.c: (nautilus_application_startup),
(desktop_changed_callback):
* src/nautilus-application.h:
* src/nautilus-main.c: (main):
Remove command line args --start-desktop & --stop-desktop and the
"Quit Nautilus Desktop" item from the desktop right click menu.
Add the command line arg: --no-default-window. Default for the
show desktop pref is now ON.
Diffstat (limited to 'src/nautilus-application.c')
| -rw-r--r-- | src/nautilus-application.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c index ba6e92e3b..096f8e9e6 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -298,8 +298,8 @@ void nautilus_application_startup (NautilusApplication *application, gboolean kill_shell, gboolean restart_shell, - gboolean stop_desktop, gboolean start_desktop, + gboolean no_default_window, const char *urls[]) { CORBA_Environment ev; @@ -425,16 +425,12 @@ nautilus_application_startup (NautilusApplication *application, Nautilus_Shell_start_desktop (shell, &ev); } - if (stop_desktop) { - Nautilus_Shell_stop_desktop (shell, &ev); - } - /* Create the other windows. */ if (urls != NULL) { url_list = nautilus_make_uri_list_from_strv (urls); Nautilus_Shell_open_windows (shell, url_list, &ev); CORBA_free (url_list); - } else if (!stop_desktop) { + } else if (!no_default_window) { Nautilus_Shell_open_default_window (shell, &ev); } } @@ -567,7 +563,7 @@ desktop_changed_callback (gpointer user_data) NautilusApplication *application; application = NAUTILUS_APPLICATION (user_data); - if ( nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP, FALSE)) { + if ( nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP, TRUE)) { nautilus_application_open_desktop (application); } else { nautilus_application_close_desktop (); |