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

Fix for gdk/x11 changes

Browse Source 
Handle the move of gdk_window_lookup() and gdk_window_foreign_new()
into the gdk_x11_ namespace.
This commit is contained in:
Owen W. Taylor 2010-12-22 16:26:08 -05:00
parent 53f53c5a91
commit c546ad9720
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shell-global.c
View File

@ -530,7 +530,8 @@ shell_global_set_cursor (ShellGlobal *global,
{ {
ClutterStage *stage = CLUTTER_STAGE (meta_plugin_get_stage (global->plugin)); ClutterStage *stage = CLUTTER_STAGE (meta_plugin_get_stage (global->plugin));
global->stage_window = gdk_window_foreign_new (clutter_x11_get_stage_window (stage)); global->stage_window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
clutter_x11_get_stage_window (stage));
} }
gdk_window_set_cursor (global->stage_window, cursor); gdk_window_set_cursor (global->stage_window, cursor);

9
src/shell-tray-manager.c
View File

@ -198,6 +198,7 @@ shell_tray_manager_manage_stage (ShellTrayManager *manager,
{ {
Window stage_xwindow; Window stage_xwindow;
GdkWindow *stage_window; GdkWindow *stage_window;
GdkDisplay *display;
GdkScreen *screen; GdkScreen *screen;
g_return_if_fail (manager->priv->stage == NULL); g_return_if_fail (manager->priv->stage == NULL);
@ -212,13 +213,15 @@ shell_tray_manager_manage_stage (ShellTrayManager *manager,
* in in some way. (The Clutter/Mutter combo is currently incapable * in in some way. (The Clutter/Mutter combo is currently incapable
* of multi-screen operation, so alternatively we could just assume * of multi-screen operation, so alternatively we could just assume
* that clutter_x11_get_default_screen() gives us the right * that clutter_x11_get_default_screen() gives us the right
* screen.) * screen.) We assume, in any case, that we are using the default
* GDK display.
*/ */
stage_window = gdk_window_lookup (stage_xwindow); display = gdk_display_get_default();
stage_window = gdk_x11_window_lookup_for_display (display, stage_xwindow);
if (stage_window) if (stage_window)
g_object_ref (stage_window); g_object_ref (stage_window);
else else
stage_window = gdk_window_foreign_new (stage_xwindow); stage_window = gdk_x11_window_foreign_new_for_display (display, stage_xwindow);
screen = gdk_window_get_screen (stage_window); screen = gdk_window_get_screen (stage_window);

5
src/st/st-im-text.c
View File

@ -61,6 +61,7 @@
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <X11/extensions/XKB.h> #include <X11/extensions/XKB.h>
#include "st-im-text.h" #include "st-im-text.h"
@ -200,11 +201,11 @@ window_for_actor (ClutterActor *actor)
stage = clutter_actor_get_stage (actor); stage = clutter_actor_get_stage (actor);
xwindow = clutter_x11_get_stage_window ((ClutterStage *)stage); xwindow = clutter_x11_get_stage_window ((ClutterStage *)stage);
window = gdk_window_lookup_for_display (display, xwindow); window = gdk_x11_window_lookup_for_display (display, xwindow);
if (window) if (window)
g_object_ref (window); g_object_ref (window);
else else
window = gdk_window_foreign_new_for_display (display, xwindow); window = gdk_x11_window_foreign_new_for_display (display, xwindow);
return window; return window;
} }

1
src/tray/na-tray-manager.c
View File

@ -27,7 +27,6 @@
#include "na-tray-manager.h" #include "na-tray-manager.h"
#include "gtk-compat.h" #include "gtk-compat.h"
#include <gdkconfig.h>
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#if defined (GDK_WINDOWING_X11) #if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h> #include <gdk/gdkx.h>