[nautilus] Update EggSMClient from libegg

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3b5af96a5f41640d447f7215a758d4de4c0220fb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 21 15:44:30 2009 +0200

    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).
---
 cut-n-paste-code/libegg/eggsmclient.c |    4 ++--
 src/nautilus-main.c                   |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cut-n-paste-code/libegg/eggsmclient.c b/cut-n-paste-code/libegg/eggsmclient.c
index 232db05..efa901d 100644
--- a/cut-n-paste-code/libegg/eggsmclient.c
+++ b/cut-n-paste-code/libegg/eggsmclient.c
@@ -249,8 +249,8 @@ egg_sm_client_get_option_group (void)
 		     egg_sm_client_debug_handler, NULL);
 
   group = g_option_group_new ("sm-client",
-			      _("Session Management Options"),
-			      _("Show Session Management options"),
+			      _("Session management options:"),
+			      _("Show session management options"),
 			      NULL, NULL);
   g_option_group_add_entries (group, entries);
   g_option_group_set_parse_hooks (group, NULL, sm_client_post_parse_func);
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a3ef577..f781dee 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);