isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gnome-2-26' into master

Browse Source 
Conflicts:
	configure.in
	src/core/schema-bindings.c
This commit is contained in:
Owen W. Taylor
2009-04-08 16:11:12 -04:00
parent 058c884f1f 82706fd958
commit 626912a9a4
56 changed files with 67624 additions and 83079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/frame.c
View File

@ -224,6 +224,7 @@ meta_window_destroy_frame (MetaWindow *window)
/* Put our state back where it should be */
meta_window_queue (window, META_QUEUE_CALC_SHOWING);
meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
}

2
src/core/schema-bindings.c
View File

@ -142,7 +142,7 @@ produce_bindings ()
g_error ("Cannot close %s: %s\n",
source_filename, strerror (errno));
}
if (fclose (target_file)!=0)
{
g_error ("Cannot close %s: %s\n",