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

Fix the build when --enable-compositor is there.

Browse Source 
Thu Feb 16 18:57:48 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/compositor.c: Fix the build when --enable-compositor is
	there.
This commit is contained in:
Søren Sandmann 2006-02-17 00:00:24 +00:00 committed by Søren Sandmann Pedersen
parent 053759fad6
commit 71b27c6228
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 16 18:57:48 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c: Fix the build when --enable-compositor is
there.
Thu Feb 16 15:54:48 2006 Søren Sandmann <sandmann@redhat.com> Thu Feb 16 15:54:48 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c: Insert #ifdef's to make it build again * src/compositor.c: Insert #ifdef's to make it build again

10
src/compositor.c
View File

@ -1113,6 +1113,9 @@ minimize_deformation (gdouble time,
info->idle_id = g_idle_add (stop_minimize, info); info->idle_id = g_idle_add (stop_minimize, info);
} }
} }
#endif
#ifdef HAVE_COMPOSITE_EXTENSIONS
static gdouble static gdouble
interpolate (gdouble t, gdouble begin, gdouble end, double power) interpolate (gdouble t, gdouble begin, gdouble end, double power)
@ -1135,6 +1138,8 @@ interpolate_rectangle (gdouble t,
result->height = interpolate (t, from->height, to->height, 1); result->height = interpolate (t, from->height, to->height, 1);
} }
#endif
#define MINIMIZE_STYLE 3 #define MINIMIZE_STYLE 3
#ifndef HAVE_COMPOSITE_EXTENSIONS #ifndef HAVE_COMPOSITE_EXTENSIONS
@ -1151,7 +1156,7 @@ meta_compositor_minimize (MetaCompositor *compositor,
int y, int y,
int width, int width,
int height, int height,
MetaMinimizeFinishedFunc finished, MetaAnimationFinishedFunc finished,
gpointer data) gpointer data)
{ {
} }
@ -1440,7 +1445,6 @@ meta_compositor_unminimize (MetaCompositor *compositor,
{ {
finished(data); finished(data);
} }
#endif
#elif MINIMIZE_STYLE == 2 #elif MINIMIZE_STYLE == 2
@ -1845,7 +1849,6 @@ run_animation (gpointer data)
return TRUE; return TRUE;
} }
} }
#endif
void void
meta_compositor_minimize (MetaCompositor *compositor, meta_compositor_minimize (MetaCompositor *compositor,
@ -1884,6 +1887,7 @@ meta_compositor_minimize (MetaCompositor *compositor,
g_idle_add (run_animation, info); g_idle_add (run_animation, info);
#endif #endif
} }
#endif
void void
meta_compositor_unminimize (MetaCompositor *compositor, meta_compositor_unminimize (MetaCompositor *compositor,