From 184a45caffb180937bfe494e4948609f081467cb Mon Sep 17 00:00:00 2001 From: jacob berkman Date: Fri, 2 Aug 2002 16:28:29 +0000 Subject: [PATCH] declare screen_x11 variable to fix build w/ xinerama 2002-08-02 jacob berkman * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare screen_x11 variable to fix build w/ xinerama --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkscreen-x11.c | 1 + 7 files changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 53e4c337db..c4d0b29c6e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-08-02 jacob berkman + + * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare + screen_x11 variable to fix build w/ xinerama + Fri Aug 2 00:43:15 2002 Owen Taylor * gdk/x11/gdkdrawable-x11.[ch] gdk/x11/gdkgc-x11.c diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 9c3526f268..f3e44f6b31 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -415,6 +415,7 @@ check_xfree_xinerama (GdkScreen *screen) #ifdef HAVE_XFREE_XINERAMA if (XineramaIsActive (GDK_SCREEN_XDISPLAY (screen))) { + GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen); XineramaScreenInfo *monitors = XineramaQueryScreens (GDK_SCREEN_XDISPLAY (screen), &screen_x11->num_monitors); if (screen_x11->num_monitors <= 0)