summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2003-01-05 19:15:58 +0000
committerHavoc Pennington <hp@src.gnome.org>2003-01-05 19:15:58 +0000
commitaad72e575df0bd837a351b184faf3e243f9a6f92 (patch)
tree9c7cd72d946e9653a14319187d9510a462a3a838
parentb799630ba587ff352acf0041ffbc30cf50102ab5 (diff)
downloadmetacity-aad72e575df0bd837a351b184faf3e243f9a6f92.tar.gz
put in the HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0
2003-01-05 Havoc Pennington <hp@pobox.com> * src/frames.c (meta_frames_apply_shapes): put in the HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0
-rw-r--r--ChangeLog5
-rw-r--r--src/frames.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7542d951..0d920019 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2003-01-05 Havoc Pennington <hp@pobox.com>
+
+ * src/frames.c (meta_frames_apply_shapes): put in the
+ HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0
+
+2003-01-05 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_show): focus new windows even in
mouse focus mode, #89981, patch from readams@hmc.edu
diff --git a/src/frames.c b/src/frames.c
index 978e2bcc..5fcd3ec6 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -835,15 +835,21 @@ meta_frames_apply_shapes (MetaFrames *frames,
Window shape_window;
Window client_window;
Region client_xregion;
+#ifdef HAVE_GTK_MULTIHEAD
GdkScreen *screen;
+#endif
int screen_number;
meta_topic (META_DEBUG_SHAPES,
"Frame 0x%lx needs to incorporate client shape\n",
frame->xwindow);
-
+
+#ifdef HAVE_GTK_MULTIHEAD
screen = gtk_widget_get_screen (GTK_WIDGET (frames));
screen_number = gdk_x11_screen_get_screen_number (screen);
+#else
+ screen_number = DefaultScreen (gdk_display);
+#endif
attrs.override_redirect = True;