Commit a11996b8 authored by Christian Neumair's avatar Christian Neumair Committed by Christian Neumair
Browse files

Support new gnome-session autostart semantics (#525056). Thanks to Lucas

2008-04-21  Christian Neumair  <cneumair@gnome.org>

	* nautilus.desktop.in.in:
	* src/nautilus-main.c (main):
	Support new gnome-session autostart semantics (#525056). Thanks to
	Lucas Rocha.

svn path=/trunk/; revision=14077
parent 715b12da
2008-04-21 Christian Neumair <cneumair@gnome.org>
* nautilus.desktop.in.in:
* src/nautilus-main.c (main):
Support new gnome-session autostart semantics (#525056). Thanks to
Lucas Rocha.
2008-04-15 Cosimo Cecchi <cosimoc@gnome.org>
* libnautilus-private/nautilus-file.c: (compare_by_time):
......
......@@ -14,3 +14,6 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Provides=desktop
X-GNOME-Autostart-Notify=true
......@@ -373,7 +373,8 @@ main (int argc, char *argv[])
gboolean no_default_window;
gboolean browser_window;
gboolean no_desktop;
const char *startup_id;
gboolean autostart_mode;
const char *startup_id, *autostart_id;
char *startup_id_copy;
char *session_to_load;
gchar *geometry;
......@@ -433,6 +434,11 @@ main (int argc, char *argv[])
g_unsetenv ("DESKTOP_STARTUP_ID");
}
autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
if (autostart_id != NULL && *autostart_id != '\0') {
autostart_mode = TRUE;
}
/* we'll do it ourselves due to complicated factory setup */
gtk_window_set_auto_startup_notification (FALSE);
......@@ -473,6 +479,14 @@ main (int argc, char *argv[])
no_default_window = TRUE;
}
/* If in autostart mode (aka started by gnome-session), we need to ensure
* nautilus starts with the correct options.
*/
if (autostart_mode) {
no_default_window = TRUE;
no_desktop = FALSE;
}
/* Do this here so that gdk_display is initialized */
if (startup_id_copy == NULL) {
/* Create a fake one containing a timestamp that we can use */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment