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

Insert #ifdef's to make it build again

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

       * src/compositor.c: Insert #ifdef's to make it build again
This commit is contained in:
Søren Sandmann 2006-02-16 21:03:02 +00:00 committed by Søren Sandmann Pedersen
parent f6738a930c
commit 053759fad6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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
Thu Feb 16 15:24:42 2006 Søren Sandmann <sandmann@redhat.com> Thu Feb 16 15:24:42 2006 Søren Sandmann <sandmann@redhat.com>
* src/screen.c (meta_screen_composite_all_windows): New function. * src/screen.c (meta_screen_composite_all_windows): New function.

16
src/compositor.c
View File

@ -88,9 +88,9 @@ free_window_hash_value (void *v)
g_object_unref (G_OBJECT (drawable_node)); g_object_unref (G_OBJECT (drawable_node));
} }
#endif /* HAVE_COMPOSITE_EXTENSIONS */
static WsDisplay *compositor_display; static WsDisplay *compositor_display;
#endif /* HAVE_COMPOSITE_EXTENSIONS */
MetaCompositor* MetaCompositor*
meta_compositor_new (MetaDisplay *display) meta_compositor_new (MetaDisplay *display)
@ -1113,7 +1113,6 @@ minimize_deformation (gdouble time,
info->idle_id = g_idle_add (stop_minimize, info); info->idle_id = g_idle_add (stop_minimize, info);
} }
} }
#endif
static gdouble static gdouble
interpolate (gdouble t, gdouble begin, gdouble end, double power) interpolate (gdouble t, gdouble begin, gdouble end, double power)
@ -1441,6 +1440,7 @@ meta_compositor_unminimize (MetaCompositor *compositor,
{ {
finished(data); finished(data);
} }
#endif
#elif MINIMIZE_STYLE == 2 #elif MINIMIZE_STYLE == 2
@ -1845,6 +1845,7 @@ run_animation (gpointer data)
return TRUE; return TRUE;
} }
} }
#endif
void void
meta_compositor_minimize (MetaCompositor *compositor, meta_compositor_minimize (MetaCompositor *compositor,
@ -1856,6 +1857,7 @@ meta_compositor_minimize (MetaCompositor *compositor,
MetaAnimationFinishedFunc finished, MetaAnimationFinishedFunc finished,
gpointer data) gpointer data)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS
MiniInfo *info = g_new (MiniInfo, 1); MiniInfo *info = g_new (MiniInfo, 1);
CmDrawableNode *node = window_to_node (compositor, window); CmDrawableNode *node = window_to_node (compositor, window);
MetaScreen *screen = window->screen; MetaScreen *screen = window->screen;
@ -1880,6 +1882,7 @@ meta_compositor_minimize (MetaCompositor *compositor,
info->scr_info = screen->compositor_data; info->scr_info = screen->compositor_data;
g_idle_add (run_animation, info); g_idle_add (run_animation, info);
#endif
} }
void void
@ -1892,6 +1895,7 @@ meta_compositor_unminimize (MetaCompositor *compositor,
MetaAnimationFinishedFunc finished, MetaAnimationFinishedFunc finished,
gpointer data) gpointer data)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS
MiniInfo *info = g_new (MiniInfo, 1); MiniInfo *info = g_new (MiniInfo, 1);
CmDrawableNode *node = window_to_node (compositor, window); CmDrawableNode *node = window_to_node (compositor, window);
MetaScreen *screen = window->screen; MetaScreen *screen = window->screen;
@ -1916,6 +1920,7 @@ meta_compositor_unminimize (MetaCompositor *compositor,
info->scr_info = screen->compositor_data; info->scr_info = screen->compositor_data;
g_idle_add (run_animation, info); g_idle_add (run_animation, info);
#endif
} }
void void
@ -1923,6 +1928,7 @@ meta_compositor_set_updates (MetaCompositor *compositor,
MetaWindow *window, MetaWindow *window,
gboolean updates) gboolean updates)
{ {
#ifdef HAVE_COMPOSITE_EXTENSIONS
CmDrawableNode *node = window_to_node (compositor, window); CmDrawableNode *node = window_to_node (compositor, window);
if (node) if (node)
@ -1932,9 +1938,9 @@ meta_compositor_set_updates (MetaCompositor *compositor,
update (window->screen); update (window->screen);
} }
#endif
} }
#endif
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
@ -1999,7 +2005,7 @@ meta_compositor_delete_window (MetaCompositor *compositor,
g_idle_add (blow_up, info); g_idle_add (blow_up, info);
} }
#endif
void void
meta_compositor_destroy (MetaCompositor *compositor) meta_compositor_destroy (MetaCompositor *compositor)
@ -2017,5 +2023,3 @@ meta_compositor_destroy (MetaCompositor *compositor)
g_free (compositor); g_free (compositor);
#endif #endif
} }
#endif