mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 23:50:41 -05:00
x11: Drop fallback on ~/.mutter paths
This old handling of session files looked on ~/.mutter, which has been unused and unsupported for a long time. It also had paths were the GError was leaked. Fix both by dropping the legacy code, and falling back to the common error paths. CID: #1502682 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2061>
This commit is contained in:
parent
4dc07999c6
commit
025dbbbc94
@ -1114,30 +1114,8 @@ load_state (const char *previous_save_file)
|
|||||||
&length,
|
&length,
|
||||||
&error))
|
&error))
|
||||||
{
|
{
|
||||||
char *canonical_session_file = session_file;
|
g_free (session_file);
|
||||||
|
goto error;
|
||||||
/* Maybe they were doing it the old way, with ~/.mutter */
|
|
||||||
session_file = g_strconcat (g_get_home_dir (),
|
|
||||||
G_DIR_SEPARATOR_S ".mutter"
|
|
||||||
G_DIR_SEPARATOR_S "sessions"
|
|
||||||
G_DIR_SEPARATOR_S,
|
|
||||||
previous_save_file,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
if (!g_file_get_contents (session_file,
|
|
||||||
&text,
|
|
||||||
&length,
|
|
||||||
NULL))
|
|
||||||
{
|
|
||||||
/* oh, just give up */
|
|
||||||
|
|
||||||
g_error_free (error);
|
|
||||||
g_free (session_file);
|
|
||||||
g_free (canonical_session_file);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_free (canonical_session_file);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_topic (META_DEBUG_SM, "Parsing saved session file %s", session_file);
|
meta_topic (META_DEBUG_SM, "Parsing saved session file %s", session_file);
|
||||||
|
Loading…
Reference in New Issue
Block a user