brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't depend on removed MetaPlugin APIs

Browse Source 
Several MetaPlugin APIs that were just wrappers around other functions
were removed - switch to using the other functions directly.

https://bugzilla.gnome.org/show_bug.cgi?id=671103
This commit is contained in:
Jasper St. Pierre 2012-02-29 22:38:35 -05:00
parent 6cde2d8db4
commit 895745ac14
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gnome-shell-plugin.c
View File

@ -303,6 +303,8 @@ static gboolean
gnome_shell_plugin_xevent_filter (MetaPlugin *plugin, gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
XEvent *xev) XEvent *xev)
{ {
MetaScreen *screen = meta_plugin_get_screen (plugin);
ClutterStage *stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin); GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
#ifdef GLX_INTEL_swap_event #ifdef GLX_INTEL_swap_event
@ -323,7 +325,7 @@ gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
#endif #endif
if ((xev->xany.type == EnterNotify || xev->xany.type == LeaveNotify) if ((xev->xany.type == EnterNotify || xev->xany.type == LeaveNotify)
&& xev->xcrossing.window == clutter_x11_get_stage_window (CLUTTER_STAGE (meta_plugin_get_stage (plugin)))) && xev->xcrossing.window == clutter_x11_get_stage_window (stage))
{ {
/* If the pointer enters a child of the stage window (eg, a /* If the pointer enters a child of the stage window (eg, a
* trayicon), we want to consider it to still be in the stage, * trayicon), we want to consider it to still be in the stage,

12
src/shell-global.c
View File

@ -562,14 +562,18 @@ void
shell_global_set_stage_input_mode (ShellGlobal *global, shell_global_set_stage_input_mode (ShellGlobal *global,
ShellStageInputMode mode) ShellStageInputMode mode)
{ {
MetaScreen *screen;
g_return_if_fail (SHELL_IS_GLOBAL (global)); g_return_if_fail (SHELL_IS_GLOBAL (global));
screen = meta_plugin_get_screen (global->plugin);
if (mode == SHELL_STAGE_INPUT_MODE_NONREACTIVE || global->gtk_grab_active) if (mode == SHELL_STAGE_INPUT_MODE_NONREACTIVE || global->gtk_grab_active)
meta_plugin_set_stage_reactive (global->plugin, FALSE); meta_empty_stage_input_region (screen);
else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region) else if (mode == SHELL_STAGE_INPUT_MODE_FULLSCREEN || !global->input_region)
meta_plugin_set_stage_reactive (global->plugin, TRUE); meta_set_stage_input_region (screen, None);
else else
meta_plugin_set_stage_input_region (global->plugin, global->input_region); meta_set_stage_input_region (screen, global->input_region);
if (mode == SHELL_STAGE_INPUT_MODE_FOCUSED) if (mode == SHELL_STAGE_INPUT_MODE_FOCUSED)
shell_global_focus_stage (global); shell_global_focus_stage (global);
@ -1020,7 +1024,7 @@ _shell_global_set_plugin (ShellGlobal *global,
global->gdk_screen = gdk_display_get_screen (global->gdk_display, global->gdk_screen = gdk_display_get_screen (global->gdk_display,
meta_screen_get_screen_number (global->meta_screen)); meta_screen_get_screen_number (global->meta_screen));
global->stage = CLUTTER_STAGE (meta_plugin_get_stage (plugin)); global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));
global->stage_xwindow = clutter_x11_get_stage_window (global->stage); global->stage_xwindow = clutter_x11_get_stage_window (global->stage);
global->stage_gdk_window = gdk_x11_window_foreign_new_for_display (global->gdk_display, global->stage_gdk_window = gdk_x11_window_foreign_new_for_display (global->gdk_display,
global->stage_xwindow); global->stage_xwindow);