diff options
| author | Søren Sandmann <sandmann@redhat.com> | 2006-02-16 20:59:05 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2006-02-16 20:59:05 +0000 |
| commit | 6e109eb9297e4e562e1f90233f1e99ad54cfcda9 (patch) | |
| tree | b1bd91601ab617a6632f33d9bf28e166142ccefe | |
| parent | 0f48ff448c93d760fa9993b5632a8c9520df3b5e (diff) | |
| download | metacity-6e109eb9297e4e562e1f90233f1e99ad54cfcda9.tar.gz | |
Insert #ifdef's to make it build again
Thu Feb 16 15:54:48 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c: Insert #ifdef's to make it build again
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/compositor.c | 12 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Thu Feb 16 15:54:48 2006 Søren Sandmann <sandmann@redhat.com> + + * src/compositor.c: Insert #ifdef's to make it build again + Wed Feb 15 18:42:03 2006 Søren Sandmann <sandmann@redhat.com> * src/compositor.[ch]: Add code to destroy compositor. Implement diff --git a/src/compositor.c b/src/compositor.c index 97ff9957..0bad4ad5 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -88,9 +88,9 @@ free_window_hash_value (void *v) g_object_unref (G_OBJECT (drawable_node)); } -#endif /* HAVE_COMPOSITE_EXTENSIONS */ static WsDisplay *compositor_display; +#endif /* HAVE_COMPOSITE_EXTENSIONS */ MetaCompositor* meta_compositor_new (MetaDisplay *display) @@ -1113,7 +1113,6 @@ minimize_deformation (gdouble time, info->idle_id = g_idle_add (stop_minimize, info); } } -#endif static gdouble interpolate (gdouble t, gdouble begin, gdouble end, double power) @@ -1441,6 +1440,7 @@ meta_compositor_unminimize (MetaCompositor *compositor, { finished(data); } +#endif #elif MINIMIZE_STYLE == 2 @@ -1845,6 +1845,7 @@ run_animation (gpointer data) return TRUE; } } +#endif void meta_compositor_minimize (MetaCompositor *compositor, @@ -1856,6 +1857,7 @@ meta_compositor_minimize (MetaCompositor *compositor, MetaAnimationFinishedFunc finished, gpointer data) { +#ifdef HAVE_COMPOSITE_EXTENSIONS MiniInfo *info = g_new (MiniInfo, 1); CmDrawableNode *node = window_to_node (compositor, window); MetaScreen *screen = window->screen; @@ -1880,6 +1882,7 @@ meta_compositor_minimize (MetaCompositor *compositor, info->scr_info = screen->compositor_data; g_idle_add (run_animation, info); +#endif } void @@ -1892,6 +1895,7 @@ meta_compositor_unminimize (MetaCompositor *compositor, MetaAnimationFinishedFunc finished, gpointer data) { +#ifdef HAVE_COMPOSITE_EXTENSIONS MiniInfo *info = g_new (MiniInfo, 1); CmDrawableNode *node = window_to_node (compositor, window); MetaScreen *screen = window->screen; @@ -1916,6 +1920,7 @@ meta_compositor_unminimize (MetaCompositor *compositor, info->scr_info = screen->compositor_data; g_idle_add (run_animation, info); +#endif } void @@ -1923,6 +1928,7 @@ meta_compositor_set_updates (MetaCompositor *compositor, MetaWindow *window, gboolean updates) { +#ifdef HAVE_COMPOSITE_EXTENSIONS CmDrawableNode *node = window_to_node (compositor, window); if (node) @@ -1932,9 +1938,9 @@ meta_compositor_set_updates (MetaCompositor *compositor, update (window->screen); } +#endif } -#endif #ifdef HAVE_COMPOSITE_EXTENSIONS |