summaryrefslogtreecommitdiff
path: root/src/nautilus-main.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-04-21 15:44:30 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2009-04-21 15:44:30 +0200
commit3b5af96a5f41640d447f7215a758d4de4c0220fb (patch)
treeb1f087ad2d181cbf872746b87eb334f54d28fb9d /src/nautilus-main.c
parent60e58366e06f42b03072e06a19f8adeece0ded6a (diff)
downloadnautilus-3b5af96a5f41640d447f7215a758d4de4c0220fb.tar.gz
Update EggSMClient from libegg
Re-apply the reverted string freeze break commit now that we branched. Don't check if the desktop file exists ourselves, as the Egg code will take care of that itself. Thanks to Christian Persch (#576619).
Diffstat (limited to 'src/nautilus-main.c')
-rw-r--r--src/nautilus-main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a3ef5778c..f781deeb2 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -391,9 +391,7 @@ 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");
- }
+ 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);