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

compositor: Assume the plugin manager always exists

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-18 18:12:29 -04:00
parent 4bf6e0ae8c
commit 420f322910
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/compositor/compositor.c
View File

@ -1010,11 +1010,7 @@ meta_compositor_filter_keybinding (MetaCompositor *compositor,
MetaKeyBinding *binding) MetaKeyBinding *binding)
{ {
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
return meta_plugin_manager_filter_keybinding (info->plugin_mgr, binding);
if (info->plugin_mgr)
return meta_plugin_manager_filter_keybinding (info->plugin_mgr, binding);
return FALSE;
} }
void void
@ -1074,11 +1070,9 @@ meta_compositor_switch_workspace (MetaCompositor *compositor,
info->switch_workspace_in_progress++; info->switch_workspace_in_progress++;
if (!info->plugin_mgr || if (!meta_plugin_manager_switch_workspace (info->plugin_mgr,
!meta_plugin_manager_switch_workspace (info->plugin_mgr, from_indx, to_indx,
from_indx, direction))
to_indx,
direction))
{ {
info->switch_workspace_in_progress--; info->switch_workspace_in_progress--;
@ -1609,10 +1603,6 @@ meta_compositor_show_tile_preview (MetaCompositor *compositor,
int tile_monitor_number) int tile_monitor_number)
{ {
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
if (!info->plugin_mgr)
return;
meta_plugin_manager_show_tile_preview (info->plugin_mgr, meta_plugin_manager_show_tile_preview (info->plugin_mgr,
window, tile_rect, tile_monitor_number); window, tile_rect, tile_monitor_number);
} }
@ -1622,9 +1612,5 @@ meta_compositor_hide_tile_preview (MetaCompositor *compositor,
MetaScreen *screen) MetaScreen *screen)
{ {
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
if (!info->plugin_mgr)
return;
meta_plugin_manager_hide_tile_preview (info->plugin_mgr); meta_plugin_manager_hide_tile_preview (info->plugin_mgr);
} }