Made handling of DevelDrivers for x86-64 more conformant to other

    platforms.
Compress all font encodings (Stefan Dirsch).
Fixed warnings.
Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
    Root mode (bugzilla #1580, James Su).
Added another compose key combination for the Euro symbol (Stefan Dirsch).
Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
    This is the encoding that is also used by glibc. We may break other
    libcs - lets see who complains.
Added explanation for DESTDIR to install to a different directory than /.
Added some early bailouts to atiprobe if PCI structure pointer is NULL to
    prevent sig11.
XV support doesn't depend on 2D acceleration any more. This patch removes
    this limitation from the NSC driver. This is a patch that I have
    committed to XFree86 a while ago but never ported over to X.Org.
    Matthieu Herrb contributed some build fixes.
Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
    timer. This takes advantage of the fact that TimerSet() with a timeout
    argument 0 behaves like TimerCanel().
Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
Changed comment to mention xorg.
Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
    you don't like it we can change it back (original author unkown).
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)

1 files changed, 63 insertions, 66 deletions

diff --git a/src/sm_manager.c b/src/sm_manager.c
index 2c49c65..23e83cb 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -32,79 +32,22 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
+#include <X11/Xtrans.h>
 
 #ifdef __USLC__
 #undef shutdown
 #endif
 
 
-Status
-SmsInitialize (vendor, release, newClientProc, managerData,
-    hostBasedAuthProc, errorLength, errorStringRet)
-
-char 		 		*vendor;
-char 		 		*release;
-SmsNewClientProc 		newClientProc;
-SmPointer	 		managerData;
-IceHostBasedAuthProc		hostBasedAuthProc;
-int  		 		errorLength;
-char 		 		*errorStringRet;
-
-{
-    if (errorStringRet && errorLength > 0)
-	*errorStringRet = '\0';
-
-    if (!newClientProc)
-    {
-	strncpy (errorStringRet,
-	    "The SmsNewClientProc callback can't be NULL", errorLength);
-
-	return (0);
-    }
-
-    if (!_SmsOpcode)
-    {
-	Status _SmsProtocolSetupProc ();
-
-	if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP",
-	    vendor, release, _SmVersionCount, _SmsVersions,
-	    _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc,
-	    _SmsProtocolSetupProc,
-	    NULL,	/* IceProtocolActivateProc - we don't care about
-			   when the Protocol Reply is sent, because the
-			   session manager can not immediately send a
-			   message - it must wait for RegisterClient. */
-	    NULL	/* IceIOErrorProc */
-            )) < 0)
-	{
-	    strncpy (errorStringRet,
-	        "Could not register XSMP protocol with ICE", errorLength);
-
-	    return (0);
-	}
-    }
-
-    _SmsNewClientProc = newClientProc;
-    _SmsNewClientData = managerData;
-
-    return (1);
-}
-
-
-
-Status
-_SmsProtocolSetupProc (iceConn,
-    majorVersion, minorVersion, vendor, release,
-    clientDataRet, failureReasonRet)
-
-IceConn    iceConn;
-int	   majorVersion;
-int	   minorVersion;
-char  	   *vendor;
-char 	   *release;
-IcePointer *clientDataRet;
-char	   **failureReasonRet;
 
+static Status
+_SmsProtocolSetupProc (IceConn    iceConn,
+		       int majorVersion,
+		       int minorVersion,
+		       char *vendor,
+		       char *release,
+		       IcePointer *clientDataRet,
+		       char **failureReasonRet)
 {
     SmsConn  		smsConn;
     unsigned long 	mask;
@@ -165,6 +108,60 @@ char	   **failureReasonRet;
 
 
 
+
+Status
+SmsInitialize (vendor, release, newClientProc, managerData,
+    hostBasedAuthProc, errorLength, errorStringRet)
+
+char 		 		*vendor;
+char 		 		*release;
+SmsNewClientProc 		newClientProc;
+SmPointer	 		managerData;
+IceHostBasedAuthProc		hostBasedAuthProc;
+int  		 		errorLength;
+char 		 		*errorStringRet;
+
+{
+    if (errorStringRet && errorLength > 0)
+	*errorStringRet = '\0';
+
+    if (!newClientProc)
+    {
+	strncpy (errorStringRet,
+	    "The SmsNewClientProc callback can't be NULL", errorLength);
+
+	return (0);
+    }
+
+    if (!_SmsOpcode)
+    {
+
+	if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP",
+	    vendor, release, _SmVersionCount, _SmsVersions,
+	    _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc,
+	    _SmsProtocolSetupProc,
+	    NULL,	/* IceProtocolActivateProc - we don't care about
+			   when the Protocol Reply is sent, because the
+			   session manager can not immediately send a
+			   message - it must wait for RegisterClient. */
+	    NULL	/* IceIOErrorProc */
+            )) < 0)
+	{
+	    strncpy (errorStringRet,
+	        "Could not register XSMP protocol with ICE", errorLength);
+
+	    return (0);
+	}
+    }
+
+    _SmsNewClientProc = newClientProc;
+    _SmsNewClientData = managerData;
+
+    return (1);
+}
+
+
+
 /* Using private API from libICE. */
 extern char *_IceGetPeerName (IceConn /* iceConn */);