1 |
eva 09/10/29 22:08:10 |
2 |
|
3 |
Added: |
4 |
nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch |
5 |
Log: |
6 |
New version for GNOME 2.28. |
7 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch |
16 |
=================================================================== |
17 |
Gentoo bug 266398 |
18 |
GNOME #580793 and #571417 |
19 |
|
20 |
Index: nautilus-2.26.2/src/nautilus-main.c |
21 |
=================================================================== |
22 |
--- nautilus-2.26.2.orig/src/nautilus-main.c 2009-04-29 17:02:32.709364982 +0200 |
23 |
+++ nautilus-2.26.2/src/nautilus-main.c 2009-04-29 17:39:36.529860872 +0200 |
24 |
@@ -391,9 +391,6 @@ main (int argc, char *argv[]) |
25 |
|
26 |
g_set_prgname ("nautilus"); |
27 |
|
28 |
- if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { |
29 |
- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); |
30 |
- } |
31 |
|
32 |
context = g_option_context_new (_("\n\nBrowse the file system with the file manager")); |
33 |
g_option_context_add_main_entries (context, options, NULL); |
34 |
@@ -464,6 +461,15 @@ main (int argc, char *argv[]) |
35 |
(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE); |
36 |
} |
37 |
|
38 |
+ /* Which .desktop file contains the relevant session management |
39 |
+ information? */ |
40 |
+ if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) |
41 |
+ && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) { |
42 |
+ egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop"); |
43 |
+ } else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { |
44 |
+ egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); |
45 |
+ } |
46 |
+ |
47 |
application = NULL; |
48 |
|
49 |
/* Do either the self-check or the real work. */ |