isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Alexey Rusakov to prevent a crash on logout with metacity

Browse Source 
2007-09-15  Elijah Newren  <newren gmail com>

	* src/session.c (warn_about_lame_clients_and_finish_interact):
	Patch from Alexey Rusakov to prevent a crash on logout with
	metacity subsequently not being restored in future sessions.
	Fixes #433253.

svn path=/trunk/; revision=3340
This commit is contained in:
Elijah Newren 2007-09-16 02:46:32 +00:00 committed by Elijah Newren
parent 976968e07e
commit dc7e1007b0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-09-15 Elijah Newren <newren gmail com>
* src/session.c (warn_about_lame_clients_and_finish_interact):
Patch from Alexey Rusakov to prevent a crash on logout with
metacity subsequently not being restored in future sessions.
Fixes #433253.
2007-09-01 Elijah Newren <newren gmail com> 2007-09-01 Elijah Newren <newren gmail com>
* HACKING: update; cvs->svn & mention GConf needed * HACKING: update; cvs->svn & mention GConf needed

6
src/session.c
View File

@ -1804,9 +1804,6 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
display_iter = display_iter->next; display_iter = display_iter->next;
} }
/* don't need to free displays */
displays = NULL;
if (lame == NULL) if (lame == NULL)
{ {
/* No lame apps. */ /* No lame apps. */
@ -1819,6 +1816,9 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
timestamp = meta_display_get_current_time_roundtrip (displays->data); timestamp = meta_display_get_current_time_roundtrip (displays->data);
sprintf (timestampbuf, "%u", timestamp); sprintf (timestampbuf, "%u", timestamp);
/* don't need to free displays */
displays = NULL;
len = g_slist_length (lame); len = g_slist_length (lame);
len *= 2; /* titles and also classes */ len *= 2; /* titles and also classes */
len += 2; /* --timestamp flag and actual timestamp */ len += 2; /* --timestamp flag and actual timestamp */