diff --git a/src/Makefile.am b/src/Makefile.am index 1c1a07ad0..227a7abbe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -110,7 +110,6 @@ metacity_SOURCES += \ compositor/clutter/tidy-texture-frame.h \ compositor/clutter/shaped-texture.c \ compositor/clutter/shaped-texture.h \ - compositor/clutter/compositor-clutter-plugin.c \ include/compositor-clutter-plugin.h \ compositor/clutter/compositor-clutter-plugin-manager.c \ compositor/clutter/compositor-clutter-plugin-manager.h diff --git a/src/compositor/clutter/compositor-clutter-plugin-manager.c b/src/compositor/clutter/compositor-clutter-plugin-manager.c index c148c8c62..b9c7b740d 100644 --- a/src/compositor/clutter/compositor-clutter-plugin-manager.c +++ b/src/compositor/clutter/compositor-clutter-plugin-manager.c @@ -52,23 +52,6 @@ struct MetaCompositorClutterPluginPrivate gboolean disabled : 1; }; -/* - * This function gets called when an effect completes. It is responsible for - * any post-effect cleanup. - */ -static void -meta_compositor_clutter_effect_completed (MetaCompositorClutterPlugin *plugin, - MetaCompWindow *actor, - unsigned long event) -{ - if (!actor) - { - g_warning ("Plugin [%s] passed NULL for actor!", - (plugin && plugin->name) ? plugin->name : "unknown"); - } - - meta_compositor_clutter_window_effect_completed (actor, event); -} static void free_plugin_workspaces (MetaCompositorClutterPlugin *plg) @@ -144,7 +127,6 @@ meta_compositor_clutter_plugin_load (MetaCompositorClutterPluginManager *mgr, priv = g_new0 (MetaCompositorClutterPluginPrivate, 1); plg->params = g_strdup (params); - plg->completed = meta_compositor_clutter_effect_completed; plg->manager_private = priv; priv->module = module; priv->self = mgr; @@ -713,3 +695,18 @@ meta_comp_clutter_plugin_get_stage (MetaCompositorClutterPlugin *plugin) return meta_compositor_clutter_get_stage_for_screen (mgr->screen); } + +void +meta_comp_clutter_plugin_effect_completed (MetaCompositorClutterPlugin *plugin, + MetaCompWindow *actor, + unsigned long event) +{ + if (!actor) + { + g_warning ("Plugin [%s] passed NULL for actor!", + (plugin && plugin->name) ? plugin->name : "unknown"); + } + + meta_compositor_clutter_window_effect_completed (actor, event); +} + diff --git a/src/compositor/clutter/compositor-clutter-plugin.c b/src/compositor/clutter/compositor-clutter-plugin.c index d7f2771c4..289581c08 100644 --- a/src/compositor/clutter/compositor-clutter-plugin.c +++ b/src/compositor/clutter/compositor-clutter-plugin.c @@ -25,11 +25,3 @@ #include "compositor-clutter-plugin.h" -void -meta_comp_clutter_plugin_effect_completed (MetaCompositorClutterPlugin *plugin, - MetaCompWindow *actor, - unsigned long event) -{ - if (plugin->completed) - plugin->completed (plugin, actor, event); -} diff --git a/src/include/compositor-clutter-plugin.h b/src/include/compositor-clutter-plugin.h index b9bb65bf9..504d08294 100644 --- a/src/include/compositor-clutter-plugin.h +++ b/src/include/compositor-clutter-plugin.h @@ -229,43 +229,18 @@ struct MetaCompositorClutterPlugin * data. */ - /* - * Manager callback for completed effects; this function must be called on the - * completion of each effect. - * - * For switch-workspace effect the plugin might pass back any actor from the - * actor list, but the actor parameter must not be NULL. - */ - void (*completed) (MetaCompositorClutterPlugin *plugin, - MetaCompWindow *actor, - unsigned long event); - /* Private; manager private data. */ void *manager_private; }; -G_INLINE_FUNC void meta_comp_clutter_plugin_effect_completed (MetaCompositorClutterPlugin *plugin, MetaCompWindow *actor, unsigned long event); -#if defined (G_CAN_INLINE) -G_INLINE_FUNC -void -meta_comp_clutter_plugin_effect_completed (MetaCompositorClutterPlugin *plugin, - MetaCompWindow *actor, - unsigned long event) -{ - if (plugin->completed) - plugin->completed (plugin, actor, event); -} -#endif - -#endif - ClutterActor * meta_comp_clutter_plugin_get_overlay_group (MetaCompositorClutterPlugin *plugin); ClutterActor * meta_comp_clutter_plugin_get_stage (MetaCompositorClutterPlugin *plugin); +#endif