Commit 3b5af96a authored by Cosimo Cecchi's avatar Cosimo Cecchi

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).
parent 60e58366
......@@ -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);
......
......@@ -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);
......
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