From e389eff79dbc85e8b9250aa7814f2e834e5225e4 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 29 Feb 2012 22:49:08 -0500 Subject: [PATCH] Remove meta_compositor_update_workspace_geometry This callback is just dead code https://bugzilla.gnome.org/show_bug.cgi?id=671104 --- src/compositor/compositor.c | 23 ----------------------- src/compositor/meta-plugin-manager.h | 4 ---- src/core/workspace.c | 12 ------------ src/meta/compositor.h | 2 -- 4 files changed, 41 deletions(-) diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 76bf8f5fa..f54a22b5d 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -871,29 +871,6 @@ meta_compositor_unmaximize_window (MetaCompositor *compositor, meta_window_actor_unmaximize (window_actor, old_rect, new_rect); } -void -meta_compositor_update_workspace_geometry (MetaCompositor *compositor, - MetaWorkspace *workspace) -{ -#if 0 - /* FIXME -- should do away with this function in favour of MetaWorkspace - * signal. - */ - MetaScreen *screen = meta_workspace_get_screen (workspace); - MetaCompScreen *info; - MetaPluginManager *mgr; - - DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n"); - info = meta_screen_get_compositor_data (screen); - mgr = info->plugin_mgr; - - if (!mgr || !workspace) - return; - - meta_plugin_manager_update_workspace (mgr, workspace); -#endif -} - void meta_compositor_switch_workspace (MetaCompositor *compositor, MetaScreen *screen, diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h index 59a7d02be..0104cc8c9 100644 --- a/src/compositor/meta-plugin-manager.h +++ b/src/compositor/meta-plugin-manager.h @@ -66,10 +66,6 @@ gboolean meta_plugin_manager_event_maximize (MetaPluginManager *mgr, gint target_y, gint target_width, gint target_height); -void meta_plugin_manager_update_workspaces (MetaPluginManager *mgr); - -void meta_plugin_manager_update_workspace (MetaPluginManager *mgr, - MetaWorkspace *w); gboolean meta_plugin_manager_switch_workspace (MetaPluginManager *mgr, gint from, diff --git a/src/core/workspace.c b/src/core/workspace.c index c858396d2..539085611 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -999,18 +999,6 @@ ensure_work_areas_validated (MetaWorkspace *workspace) /* We're all done, YAAY! Record that everything has been validated. */ workspace->work_areas_invalid = FALSE; - - { - /* - * Notify the compositor that the workspace geometry has changed. - */ - MetaScreen *screen = workspace->screen; - MetaDisplay *display = meta_screen_get_display (screen); - MetaCompositor *comp = meta_display_get_compositor (display); - - if (comp) - meta_compositor_update_workspace_geometry (comp, workspace); - } } static gboolean diff --git a/src/meta/compositor.h b/src/meta/compositor.h index 4ed4cab17..c65267bf5 100644 --- a/src/meta/compositor.h +++ b/src/meta/compositor.h @@ -153,8 +153,6 @@ void meta_compositor_set_updates (MetaCompositor *compositor, MetaWindow *window, gboolean updates); -void meta_compositor_update_workspace_geometry (MetaCompositor *compositor, - MetaWorkspace *workspace); void meta_compositor_sync_stack (MetaCompositor *compositor, MetaScreen *screen, GList *stack);