versionedServerAtoms.patch

   1 ---
   2
   3  source/server_common.c |   18 +++++++++---------
   4  1 file changed, 9 insertions(+), 9 deletions(-)
   5
   6 diff --quilt old/source/server_common.c new/source/server_common.c
   7 --- old/source/server_common.c
   8 +++ new/source/server_common.c
   9 @@ -56,13 +56,13 @@ void CreateServerPropertyAtoms(const cha
  10                                Atom *serverExistsAtomReturn,
  11                                Atom *serverRequestAtomReturn)
  12  {
  13 -    char propName[20+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN];
  14 +    char propName[24+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN];
  15      const char *userName = GetUserName();
  16      const char *hostName = GetNameOfHost();
  17
  18 -    sprintf(propName, "NEDIT_SERVER_EXISTS_%s_%s_%s", hostName, userName, serverName);
  19 +    sprintf(propName, "NEDIT_5.7_SERVER_EXISTS_%s_%s_%s", hostName, userName, serverName);
  20      *serverExistsAtomReturn = XInternAtom(TheDisplay, propName, False);
  21 -    sprintf(propName, "NEDIT_SERVER_REQUEST_%s_%s_%s", hostName, userName, serverName);
  22 +    sprintf(propName, "NEDIT_5.7_SERVER_REQUEST_%s_%s_%s", hostName, userName, serverName);
  23      *serverRequestAtomReturn = XInternAtom(TheDisplay, propName, False);
  24  }
  25
  26 @@ -86,12 +86,12 @@ void CreateServerPropertyAtoms(const cha
  27  Atom CreateServerFileOpenAtom(const char *serverName,
  28                               const char *path)
  29  {
  30 -    char propName[10+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1+MAXPATHLEN+1+7];
  31 +    char propName[14+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1+MAXPATHLEN+1+7];
  32      const char *userName = GetUserName();
  33      const char *hostName = GetNameOfHost();
  34      Atom        atom;
  35
  36 -    sprintf(propName, "NEDIT_FILE_%s_%s_%s_%s_WF_OPEN", hostName, userName, serverName, path);
  37 +    sprintf(propName, "NEDIT_5.7_FILE_%s_%s_%s_%s_WF_OPEN", hostName, userName, serverName, path);
  38      atom = XInternAtom(TheDisplay, propName, False);
  39      return(atom);
  40  }
  41 @@ -100,12 +100,12 @@ Atom CreateServerFileClosedAtom(const ch
  42                                 const char *path,
  43                                  Bool only_if_exist)
  44  {
  45 -    char propName[10+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1+MAXPATHLEN+1+9];
  46 +    char propName[14+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1+MAXPATHLEN+1+9];
  47      const char *userName = GetUserName();
  48      const char *hostName = GetNameOfHost();
  49      Atom        atom;
  50
  51 -    sprintf(propName, "NEDIT_FILE_%s_%s_%s_%s_WF_CLOSED", hostName, userName, serverName, path);
  52 +    sprintf(propName, "NEDIT_5.7_FILE_%s_%s_%s_%s_WF_CLOSED", hostName, userName, serverName, path);
  53      atom = XInternAtom(TheDisplay, propName, only_if_exist);
  54      return(atom);
  55  }
  56 @@ -116,10 +116,10 @@ Atom CreateServerFileClosedAtom(const ch
  57   */
  58  void DeleteServerFileAtoms(const char* serverName, Window rootWindow)
  59  {
  60 -    char propNamePrefix[10+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1];
  61 +    char propNamePrefix[14+1+MAXNODENAMELEN+1+MAXUSERNAMELEN+1+MAXSERVERNAMELEN+1];
  62      const char *userName = GetUserName();
  63      const char *hostName = GetNameOfHost();
  64 -    int length = sprintf(propNamePrefix, "NEDIT_FILE_%s_%s_%s_", hostName, userName, serverName);
  65 +    int length = sprintf(propNamePrefix, "NEDIT_5.7_FILE_%s_%s_%s_", hostName, userName, serverName);
  66
  67      int nProperties;
  68      Atom* atoms = XListProperties(TheDisplay, rootWindow, &nProperties);