brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Move composite version checks here

Browse Source
This commit is contained in:
Jasper St. Pierre
2014-08-13 19:32:39 -04:00
parent 879407c10c
commit e935b52e51
3 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/display.c
View File

@ -415,11 +415,15 @@ enable_compositor (MetaDisplay *display)
return;
}
if (!display->compositor)
display->compositor = meta_compositor_new (display);
int version = (display->composite_major_version * 10) + display->composite_minor_version;
if (version < 3)
{
meta_warning ("Your version of COMPOSITE is too old.");
return;
}
if (!display->compositor)
return;
display->compositor = meta_compositor_new (display);
meta_compositor_manage (display->compositor);
}
@ -3095,15 +3099,6 @@ meta_display_modifiers_accelerator_activate (MetaDisplay *display)
return freeze;
}
void
meta_display_get_compositor_version (MetaDisplay *display,
int *major,
int *minor)
{
*major = display->composite_major_version;
*minor = display->composite_minor_version;
}
/**
* meta_display_get_xinput_opcode: (skip)
* @display: a #MetaDisplay