isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-13 05:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace some GDK X11 calls with future-proof ones

Browse Source 
GTK is about to clean up its code and remove duplicate macros and
GdkDrawable usage. To prepare for that landing, we use the future-safe
versions of the same calls.

https://bugzilla.gnome.org/show_bug.cgi?id=636302
This commit is contained in:
Benjamin Otte 2010-12-02 15:51:36 +01:00
parent d746591894
commit 8994e621f7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/mutter-window-demo.c
View File

@ -51,7 +51,7 @@ set_gdk_window_struts (GdkWindow *window,
vals[11] = 800; vals[11] = 800;
XChangeProperty (GDK_WINDOW_XDISPLAY (window), XChangeProperty (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XWINDOW (window), GDK_WINDOW_XID (window),
XInternAtom (GDK_WINDOW_XDISPLAY (window), XInternAtom (GDK_WINDOW_XDISPLAY (window),
"_NET_WM_STRUT_PARTIAL", False), "_NET_WM_STRUT_PARTIAL", False),
XA_CARDINAL, 32, PropModeReplace, XA_CARDINAL, 32, PropModeReplace,
@ -125,7 +125,7 @@ set_gdk_window_type (GdkWindow *window,
type, False); type, False);
XChangeProperty (GDK_WINDOW_XDISPLAY (window), XChangeProperty (GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XWINDOW (window), GDK_WINDOW_XID (window),
XInternAtom (GDK_WINDOW_XDISPLAY (window), "_NET_WM_WINDOW_TYPE", False), XInternAtom (GDK_WINDOW_XDISPLAY (window), "_NET_WM_WINDOW_TYPE", False),
XA_ATOM, 32, PropModeReplace, XA_ATOM, 32, PropModeReplace,
(guchar *)atoms, (guchar *)atoms,

4
src/ui/menu.c
View File

@ -401,10 +401,10 @@ meta_window_menu_new (MetaFrames *frames,
n_workspaces, active_workspace); n_workspaces, active_workspace);
window = gtk_widget_get_window (GTK_WIDGET (frames)); window = gtk_widget_get_window (GTK_WIDGET (frames));
display = gdk_x11_drawable_get_xdisplay (window); display = GDK_WINDOW_XDISPLAY (window);
screen = gdk_window_get_screen (window); screen = gdk_window_get_screen (window);
xroot = GDK_DRAWABLE_XID (gdk_screen_get_root_window (screen)); xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
submenu = gtk_menu_new (); submenu = gtk_menu_new ();

4
src/ui/tile-preview.c
View File

@ -195,7 +195,7 @@ meta_tile_preview_show (MetaTilePreview *preview,
gtk_widget_show (preview->preview_window); gtk_widget_show (preview->preview_window);
window = gtk_widget_get_window (preview->preview_window); window = gtk_widget_get_window (preview->preview_window);
meta_core_lower_beneath_focus_window (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), meta_core_lower_beneath_focus_window (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
GDK_WINDOW_XWINDOW (window), GDK_WINDOW_XID (window),
gtk_get_current_event_time ()); gtk_get_current_event_time ());
old_rect.x = old_rect.y = 0; old_rect.x = old_rect.y = 0;
@ -254,5 +254,5 @@ meta_tile_preview_get_xwindow (MetaTilePreview *preview,
if (create_serial) if (create_serial)
*create_serial = preview->create_serial; *create_serial = preview->create_serial;
return GDK_WINDOW_XWINDOW (window); return GDK_WINDOW_XID (window);
} }