From 0c5cacf7ccc03bf299b5ccdcb56741d0bcd6125d Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 20 Oct 2002 17:17:16 +0000 Subject: [PATCH] put multihead stuff in HAVE_GTK_MULTIHEAD, reported by John Palmieri 2002-10-20 Havoc Pennington * src/ui.c (meta_image_window_new): put multihead stuff in HAVE_GTK_MULTIHEAD, reported by John Palmieri --- ChangeLog | 5 +++++ src/ui.c | 19 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fca4dcb41..721fb67fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-20 Havoc Pennington + + * src/ui.c (meta_image_window_new): put multihead stuff in + HAVE_GTK_MULTIHEAD, reported by John Palmieri + 2002-10-20 Havoc Pennington * src/keybindings.c (handle_raise_or_lower): check above->mapped diff --git a/src/ui.c b/src/ui.c index 50f24be6f..5074d6b0f 100644 --- a/src/ui.c +++ b/src/ui.c @@ -309,15 +309,22 @@ meta_image_window_new (Display *xdisplay, int max_height) { MetaImageWindow *iw; - GdkDisplay *gdisplay; - GdkScreen *gscreen; - - gdisplay = gdk_x11_lookup_xdisplay (xdisplay); - gscreen = gdk_display_get_screen (gdisplay, screen_number); iw = g_new (MetaImageWindow, 1); iw->window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_screen (GTK_WINDOW (iw->window), gscreen); + +#ifdef HAVE_GTK_MULTIHEAD + { + GdkDisplay *gdisplay; + GdkScreen *gscreen; + + gdisplay = gdk_x11_lookup_xdisplay (xdisplay); + gscreen = gdk_display_get_screen (gdisplay, screen_number); + + gtk_window_set_screen (GTK_WINDOW (iw->window), gscreen); + } +#endif + gtk_widget_realize (iw->window); iw->pixmap = gdk_pixmap_new (iw->window->window, max_width, max_height,