Merge branch 'work' into clutter

This commit is contained in:
Tomas Frydrych 2008-11-20 12:43:25 +00:00
commit bcc5f104db
2 changed files with 8 additions and 0 deletions

View File

@ -2918,3 +2918,9 @@ meta_screen_get_active_workspace_index (MetaScreen *screen)
return meta_workspace_index (active);
}
MetaWorkspace *
meta_screen_get_active_workspace (MetaScreen *screen)
{
return screen->active_workspace;
}

View File

@ -61,4 +61,6 @@ MetaWorkspace *meta_screen_append_new_workspace (MetaScreen *screen,
int meta_screen_get_active_workspace_index (MetaScreen *screen);
MetaWorkspace * meta_screen_get_active_workspace (MetaScreen *screen);
#endif