summaryrefslogtreecommitdiff
path: root/src/ui/ui.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-09-15 08:17:22 -0400
committerThomas Thurman <tthurman@gnome.org>2010-09-15 08:17:22 -0400
commit874f55b645d664925b49ee9972cd82dc39287098 (patch)
treec4720166471a09ad12cec7dcd429506561237946 /src/ui/ui.c
parent4e6a3abe146ea858b0097d230fbdfefd1e1cc14e (diff)
downloadmetacity-874f55b645d664925b49ee9972cd82dc39287098.tar.gz
metacity-874f55b645d664925b49ee9972cd82dc39287098.tar.bz2
Removes usage of (newly deprecated) gdk_display
Diffstat (limited to 'src/ui/ui.c')
-rw-r--r--src/ui/ui.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 54fa26f..f15e4bc 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -67,7 +67,7 @@ meta_ui_init (int *argc, char ***argv)
Display*
meta_ui_get_display (void)
{
- return gdk_display;
+ return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
}
/* We do some of our event handling in frames.c, which expects
@@ -266,6 +266,7 @@ meta_ui_new (Display *xdisplay,
gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
g_assert (gdisplay == gdk_display_get_default ());
+ g_assert (xdisplay == GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
ui->frames = meta_frames_new (XScreenNumberOfScreen (screen));
gtk_widget_realize (GTK_WIDGET (ui->frames));
@@ -547,7 +548,7 @@ meta_image_window_set_showing (MetaImageWindow *iw,
else
{
gtk_widget_hide (iw->window);
- meta_core_increment_event_serial (gdk_display);
+ meta_core_increment_event_serial (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
}
}