startx.cpp and default server (patch provided)

[Jeremy Huddleston]

I'd vote for that... but I've just been careful about protecting what  
I commit with '#ifdef __APPLE__' since I haven't been really testing  
them elsewhere...

On Apr 17, 2008, at 14:46, Jeremy C. Reed wrote:

> Now looking at the new changes for __APPLE__, why not just use that  
> for
> any platform? That should fix my problem on non-__APPLE__ too.
>
>> diff --git a/startx.cpp b/startx.cpp
>> index 7e67769..9931281 100644
>> --- a/startx.cpp
>> +++ b/startx.cpp
>> @@ -216,17 +216,17 @@ XCOMM process server arguments
>> if [ x"$server" = x ]; then
>>     XCOMM if no server arguments or display either, use rc file  
>> instead
>>     if [ x"$serverargs" = x -a x"$display" = x ]; then
>> #ifdef __APPLE__
>> 	server=$defaultserver
>> 	serverargs=$defaultserverargs
>> 	display="$defaultdisplay"
>> #else
>> -	server="$defaultserverargs"
>> +	server="$defaultserver $defaultserverargs"
>> #endif
>>     else
>> 	server=$defaultserver
>>     fi
>> fi
>>
>> if [ x"$enable_xauth" = x1 ] ; then
>>     if [ x"$XAUTHORITY" = x ]; then

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3040 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20080417/c7aa5fce/attachment.bin>