diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-02-14 10:59:23 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-02-14 10:59:23 +0000 |
| commit | 00858aa133533269707d3e165ff34652b6d29c9c (patch) | |
| tree | 6914a5a381bdd29f16f848f8d7f2ffd6916d335a /src/nautilus-main.c | |
| parent | 50d42be08e647e0b63a5492e54d3fcf7a97d7a6f (diff) | |
| download | nautilus-00858aa133533269707d3e165ff34652b6d29c9c.tar.gz | |
Enable startup notification.
2005-02-14 Alexander Larsson <alexl@redhat.com>
* data/applications.desktop.in:
* data/favorites.desktop.in:
* src/network-scheme.desktop.in:
* nautilus-computer.desktop.in:
* nautilus-folder-handler.desktop.in:
* nautilus-home.desktop.in:
* nautilus.desktop.in:
Enable startup notification.
* src/nautilus-application.c:
* src/nautilus-application.h:
* src/nautilus-bookmarks-window.c:
* src/nautilus-connect-server-dialog-nonmain.c:
* src/nautilus-location-bar.c:
* src/nautilus-main.c:
* src/nautilus-navigation-window-menus.c:
* src/nautilus-shell-interface.idl:
* src/nautilus-shell.c:
* src/nautilus-window-manage-views.c:
* src/nautilus-window-private.h:
* src/nautilus-window.c:
Handle startup notification across corba activation.
Patch from Elijah Newren <newren@gmail.com>
Diffstat (limited to 'src/nautilus-main.c')
| -rw-r--r-- | src/nautilus-main.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 5d0f52faf..9417eff89 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -196,6 +196,8 @@ main (int argc, char *argv[]) gboolean no_default_window; gboolean browser_window; gboolean no_desktop; + const char *startup_id; + char *startup_id_copy; char *geometry; gboolean perform_self_check; poptContext popt_context; @@ -246,6 +248,17 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); + startup_id = g_getenv ("DESKTOP_STARTUP_ID"); + startup_id_copy = NULL; + if (startup_id != NULL && *startup_id != '\0') { + /* Clear the DESKTOP_STARTUP_ID, but make sure to copy it first */ + startup_id_copy = g_strdup (startup_id); + putenv ("DESKTOP_STARTUP_ID="); + } + + /* we'll do it ourselves due to complicated factory setup */ + gtk_window_set_auto_startup_notification (FALSE); + /* Get parameters. */ geometry = NULL; kill_shell = FALSE; @@ -349,6 +362,7 @@ main (int argc, char *argv[]) kill_shell, restart_shell, no_default_window, no_desktop, !(kill_shell || restart_shell), browser_window, + startup_id_copy, geometry, args); if (is_event_loop_needed ()) { |