brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Xlib doesn't like NULL for out arguments; fix for #80472 from lbedford

Browse Source 
2002-05-01  Havoc Pennington  <hp@redhat.com>

	* src/screen.c (meta_screen_new): Xlib doesn't like NULL for out
	arguments; fix for #80472 from lbedford
This commit is contained in:
Havoc Pennington 2002-05-01 16:31:58 +00:00 committed by Havoc Pennington
parent 82ceb7c837
commit 14dccacfde
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-05-01 Havoc Pennington <hp@redhat.com>
* src/screen.c (meta_screen_new): Xlib doesn't like NULL for out
arguments; fix for #80472 from lbedford
2002-04-30 Havoc Pennington <hp@pobox.com> 2002-04-30 Havoc Pennington <hp@pobox.com>
* src/keybindings.c: finish mopping up mode_switch_mask field * src/keybindings.c: finish mopping up mode_switch_mask field

6
src/run-metacity.sh
View File

@ -38,9 +38,13 @@ if test -n "$DEMO_TEST"; then
TEST_CLIENT='./tools/metacity-window-demo' TEST_CLIENT='./tools/metacity-window-demo'
fi fi
if test -n "$XINERAMA"; then
XINERAMA_FLAGS='+xinerama'
fi
if test -z "$ONLY_WM"; then if test -z "$ONLY_WM"; then
echo "Launching Xnest" echo "Launching Xnest"
Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 & Xnest -ac $XNEST_DISPLAY -scrns $SCREENS -geometry 640x480 -bw 15 $XINERAMA_FLAGS &
## usleep 800000 ## usleep 800000
sleep 1 sleep 1

5
src/screen.c
View File

@ -164,6 +164,7 @@ meta_screen_new (MetaDisplay *display,
MetaScreen *screen; MetaScreen *screen;
Window xroot; Window xroot;
Display *xdisplay; Display *xdisplay;
int xinerama_event_base, xinerama_error_base;
/* Only display->name, display->xdisplay, and display->error_traps /* Only display->name, display->xdisplay, and display->error_traps
* can really be used in this function, since normally screens are * can really be used in this function, since normally screens are
@ -220,7 +221,9 @@ meta_screen_new (MetaDisplay *display,
screen->n_xinerama_infos = 0; screen->n_xinerama_infos = 0;
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
if (XineramaQueryExtension (display->xdisplay, NULL, NULL)) if (XineramaQueryExtension (display->xdisplay,
&xinerama_event_base,
&xinerama_error_base))
{ {
XineramaScreenInfo *infos; XineramaScreenInfo *infos;
int n_infos; int n_infos;