remove locale from SmcCloseConnection

Added SmcDeleteProperties

1 files changed, 35 insertions, 7 deletions

diff --git a/xc/lib/SM/sm_client.c b/xc/lib/SM/sm_client.c
index 729ed0e66..ed1287be8 100644
--- a/xc/lib/SM/sm_client.c
+++ b/xc/lib/SM/sm_client.c
@@ -1,4 +1,4 @@
-/* $XConsortium: sm_client.c,v 1.15 93/12/06 20:06:32 mor Exp $ */
+/* $XConsortium: sm_client.c,v 1.16 93/12/07 11:05:30 mor Exp $ */
 /******************************************************************************
 
 Copyright 1993 by the Massachusetts Institute of Technology,
@@ -237,7 +237,6 @@ char    **reasonMsgs;
 {
     IceConn	iceConn = smcConn->iceConn;
     int		i;
-    char	*locale;
 
     if (IceCheckShutdownNegotiation (iceConn) == True)
     {
@@ -245,9 +244,7 @@ char    **reasonMsgs;
 	char 			*pData;
 	int			extra;
 
-	locale = setlocale (LC_CTYPE, NULL);
-
-	extra = 8 + ARRAY8_BYTES (strlen (locale));
+	extra = 8;
 
 	for (i = 0; i < count; i++)
 	    extra += ARRAY8_BYTES (strlen (reasonMsgs[i]));
@@ -256,8 +253,6 @@ char    **reasonMsgs;
 	    SIZEOF (smCloseConnectionMsg), WORD64COUNT (extra),
 	    smCloseConnectionMsg, pMsg, pData);
 
-	STORE_ARRAY8 (pData, strlen (locale), locale);
-
 	STORE_CARD32 (pData, count);
 	pData += 4;
 
@@ -380,6 +375,39 @@ SmProp       	**props;
 
 
 void
+SmcDeleteProperties (smcConn, numProps, propNames)
+
+SmcConn smcConn;
+int     numProps;
+char	**propNames;
+
+{
+    IceConn			iceConn = smcConn->iceConn;
+    smDeletePropertiesMsg 	*pMsg;
+    char 			*pData;
+    int				extra, i;
+
+    extra = 8;
+
+    for (i = 0; i < numProps; i++)
+	extra += ARRAY8_BYTES (strlen (propNames[i]));
+
+    IceGetHeaderExtra (iceConn, _SmcOpcode, SM_DeleteProperties,
+	SIZEOF (smDeletePropertiesMsg), WORD64COUNT (extra),
+	smDeletePropertiesMsg, pMsg, pData);
+
+    STORE_CARD32 (pData, numProps);
+    pData += 4;
+
+    for (i = 0; i < numProps; i++)
+	STORE_ARRAY8 (pData, strlen (propNames[i]), propNames[i]); 
+
+    IceFlush (iceConn);
+}
+
+
+
+void
 SmcGetProperties (smcConn, propReplyProc, clientData)
 
 SmcConn		 smcConn;