[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.7-5-gcf5a598

X2go dev team git-admin at x2go.org
Sun Jan 22 23:03:16 CET 2012


The branch, master has been updated
       via  cf5a5980cf0b3dc0c0c893d52594dbdfc7add0b4 (commit)
      from  5027f1e8b5d0a3571272e3eff4aa86bb8cae55f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf5a5980cf0b3dc0c0c893d52594dbdfc7add0b4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jan 22 23:02:50 2012 +0100

    Fix patch: 109_nxagent_locale-utf8-compound-text.patch, fix crashes reported from Stefan Baur. Thanks for reporting and testing!!!

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 ...09_nxagent_locale-utf8-compound-text.full.patch |   37 +++++++------------
 2 files changed, 16 insertions(+), 23 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ebf996c..5df913c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.8-0) UNRELEASED; urgency=low
   * Package x2goagent is an ,,all'' package, not ,,any''.
   * Add folder /debian/patches-pending-evaluation with two newly discovered
     patches from git.etersoft.ru (AltLinux packaging repository for NX).
+  * Fix patch: 109_nxagent_locale-utf8-compound-text.patch, fix crashes
+    reported from Stefan Baur. Thanks for reporting and testing!!!
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 16 Jan 2012 22:28:13 +0100
 
diff --git a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
index 74bd53b..29abd99 100644
--- a/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
+++ b/debian/patches/109_nxagent_locale-utf8-compound-text.full.patch
@@ -26,7 +26,7 @@ Last-Update: 2011-12-31
 +  char *locale = setlocale(LC_ALL, "");
 +  if (!locale)
 +   fprintf(stderr, "InitOutput: failed to set locale, reverting to \"C\"\n");
-+  else 
++  else
 +  {
 +    if (!XSupportsLocale())
 +      fprintf(stderr, "InitOutput: Locale %s not supported by X\n",locale);
@@ -51,23 +51,12 @@ Last-Update: 2011-12-31
  /*
   * Set here the required log level.
   */
-@@ -100,6 +104,10 @@
- 
- static void nxagentRemovePropertyFromList(void);
- 
-+/* by dimbor */
-+static char szAgentUTF8_STRING[] = "UTF8_STRING";
-+static Atom agentUTF8_STRING;
-+
- /*
-  * This is currently unused.
-  */
-@@ -419,6 +427,28 @@
+@@ -419,6 +423,28 @@
    }
  }
  
 +/* by dimbor */
-+char *textToUTF8String(char *text, int nitems) 
++char *textToUTF8String(char *text, int nitems)
 +{
 +  XTextProperty t_prop;
 +  char *ret=NULL;
@@ -79,7 +68,7 @@ Last-Update: 2011-12-31
 +  t_prop.encoding=XInternAtom(nxagentDisplay, "COMPOUND_TEXT", 0);
 +  char **list;
 +  int num;
-+  int r = XmbTextPropertyToTextList(nxagentDisplay, &t_prop,&list, &num);
++  int r = Xutf8TextPropertyToTextList(nxagentDisplay, &t_prop,&list, &num);
 +  if ((r == Success || r > 0) && num > 0 && *list)
 +  {
 +    ret=(char *)strdup (*list);
@@ -91,7 +80,7 @@ Last-Update: 2011-12-31
  int nxagentExportAllProperty(pWin)
    WindowPtr pWin;
  {
-@@ -464,6 +494,7 @@
+@@ -464,6 +490,7 @@
  
    if (strncmp(propertyS, "WM_", 3) != 0 &&
            strncmp(propertyS, "_NET_", 5) != 0 &&
@@ -99,7 +88,7 @@ Last-Update: 2011-12-31
                strcmp(propertyS, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR") != 0)
    {
      #ifdef TEST
-@@ -474,6 +505,7 @@
+@@ -474,6 +501,7 @@
      #endif
    }
    else if (strcmp(typeS, "STRING") == 0 ||
@@ -107,18 +96,20 @@ Last-Update: 2011-12-31
                 #ifndef _XSERVER64
                 strcmp(typeS, "CARDINAL") == 0 ||
                     strcmp(typeS, "WM_SIZE_HINTS") == 0 ||
-@@ -483,6 +515,15 @@
+@@ -483,6 +511,17 @@
      output = value;
      export = True;
    }
-+  /* add by dimbor */
++  /* add by dimbor, modified by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> */
 +  else if (strcmp(typeS, "COMPOUND_TEXT") == 0)
 +  {
 +    output = textToUTF8String(value, nUnits);
-+    nUnits = strlen((char *) output);
-+    type = MakeAtom(szAgentUTF8_STRING, strlen(szAgentUTF8_STRING), True);
-+    freeMem = True;
-+    export = True;
++    if ( output != NULL ) {
++      nUnits = strlen((char *) output);
++      type = MakeAtom("UTF8_STRING", strlen("UTF8_STRING"), True);
++      freeMem = True;
++      export = True;
++    }
 +  }
    #ifdef _XSERVER64
    else if (strcmp(typeS, "CARDINAL") == 0 || strcmp(typeS, "WM_SIZE_HINTS") == 0)


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list