blob: d6ca6eb97227657625faa745f8171825ee188bf1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Gentoo bug 266398
GNOME #580793 and #571417
Index: nautilus-2.26.2/src/nautilus-main.c
===================================================================
--- nautilus-2.26.2.orig/src/nautilus-main.c 2009-04-29 17:02:32.709364982 +0200
+++ nautilus-2.26.2/src/nautilus-main.c 2009-04-29 17:39:36.529860872 +0200
@@ -391,9 +391,6 @@ main (int argc, char *argv[])
browser_window = FALSE;
g_set_prgname ("nautilus");
- if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
- }
context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
g_option_context_add_main_entries (context, options, NULL);
@@ -464,6 +461,15 @@ main (int argc, char *argv[])
(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
}
+ /* Which .desktop file contains the relevant session management
+ information? */
+ if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
+ && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
+ egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
+ } else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+ egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+ }
+
application = NULL;
/* Do either the self-check or the real work. */
|
GitWeb
