diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 10:42:42 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2011-12-29 10:42:42 +0100 |
| commit | 43c04dbfd48025bf6eda40e9b82c812f44290188 (patch) | |
| tree | ad31e5c5af7401644e06bbfb7ca27d3b78761bdd /debian/patches/200_nxagent_unbrand-agent.patch | |
| parent | 9f226601ff68e75b2baa68bbf08da369c62527e1 (diff) | |
| download | nx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.tar.gz nx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.tar.bz2 nx-libs-43c04dbfd48025bf6eda40e9b82c812f44290188.zip | |
Rework FreeNX patches to be applicable to latest NX sources.
Diffstat (limited to 'debian/patches/200_nxagent_unbrand-agent.patch')
| -rw-r--r-- | debian/patches/200_nxagent_unbrand-agent.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/debian/patches/200_nxagent_unbrand-agent.patch b/debian/patches/200_nxagent_unbrand-agent.patch index b38d89d53..8e441ca7b 100644 --- a/debian/patches/200_nxagent_unbrand-agent.patch +++ b/debian/patches/200_nxagent_unbrand-agent.patch @@ -1,6 +1,6 @@ --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c -@@ -1539,7 +1539,20 @@ +@@ -1754,7 +1754,20 @@ #ifdef TEST fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n", nxagentDefaultWindows[pScreen->myNum]); @@ -32,17 +32,6 @@ #define nxagentSetPrintGeometry(screen) \ nxagentPrintGeometryFlags = (1 << (screen)); ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -1861,7 +1861,7 @@ - strncpy(default_path, "", 255); - - strcat(icon_filename, NXAGENT_ICON_NAME); -- strcat(default_path,"/usr/NX/share/images/"); -+ strcat(default_path,"/usr/share/pixmaps/"); - strcat(default_path,icon_filename); - - if ((icon_fp = fopen(default_path, "r")) == NULL) --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -204,6 +204,7 @@ @@ -53,3 +42,14 @@ if (!nxagentPixmapLogo) { return; +--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c +@@ -1919,7 +1919,7 @@ + XlibPixmap IconPixmap; + XlibPixmap IconShape; + +- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); ++ snprintf(default_path, PATH_MAX-1, "/usr/share/pixmaps/%s", NXAGENT_ICON_NAME); + + if ((icon_fp = fopen(default_path, "r")) == NULL) + { |