aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/999_nxagent_unbrand-agent.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 15:31:11 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-01-11 15:31:11 +0100
commit3744795d3c3b526cd2438b6e9423f8f09b372db1 (patch)
tree426a8d92437b9e5b3775fee8a240eb7542929d91 /debian/patches/999_nxagent_unbrand-agent.patch
parenteaea40dec0dc42e78b610837330cf39ca13beb8f (diff)
downloadnx-libs-3744795d3c3b526cd2438b6e9423f8f09b372db1.tar.gz
nx-libs-3744795d3c3b526cd2438b6e9423f8f09b372db1.tar.bz2
nx-libs-3744795d3c3b526cd2438b6e9423f8f09b372db1.zip
Rename nxagent-unbrand patch, so that is the last patch to be applied (999_<patchname>).
Diffstat (limited to 'debian/patches/999_nxagent_unbrand-agent.patch')
-rw-r--r--debian/patches/999_nxagent_unbrand-agent.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/debian/patches/999_nxagent_unbrand-agent.patch b/debian/patches/999_nxagent_unbrand-agent.patch
new file mode 100644
index 000000000..c9aea0496
--- /dev/null
+++ b/debian/patches/999_nxagent_unbrand-agent.patch
@@ -0,0 +1,61 @@
+Description: Unbrand NX Agent Startup Screen
+ By design this patch is probably not interesting to
+ NX upstream.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Last-Update: 2012-12-31
+--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+@@ -1754,7 +1754,20 @@
+ #ifdef TEST
+ fprintf(stderr, "nxagentOpenScreen: Created new default window with id [%ld].\n",
+ nxagentDefaultWindows[pScreen->myNum]);
++
++ fprintf(stderr, "nxagentOpenScreen: Setting WM_CLASS and WM_NAME for window withid [%ld].\n",
++ nxagentDefaultWindows[pScreen->myNum]);
+ #endif
++
++ XClassHint hint;
++ hint.res_name=malloc(strlen(HINT)+1);
++ hint.res_class=malloc(strlen(HINT)+1);
++ strcpy(hint.res_name,HINT);
++ strcpy(hint.res_class,HINT);
++ XSetClassHint(nxagentDisplay,nxagentDefaultWindows[pScreen->myNum],&hint);
++ free(hint.res_name);
++ free(hint.res_class);
++
+
+ if (nxagentOption(Fullscreen))
+ {
+--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h
+@@ -36,6 +36,8 @@
+ #define MIN_NXAGENT_HEIGHT 60
+ #define NXAGENT_FRAME_WIDTH 2000
+
++#define HINT "NXAgent"
++
+ #define nxagentSetPrintGeometry(screen) \
+ nxagentPrintGeometryFlags = (1 << (screen));
+
+--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+@@ -204,6 +204,7 @@
+
+ nxagentPixmapLogo = XCreatePixmap(nxagentDisplay, win, width, height, nxagentLogoDepth);
+
++ return;
+ 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)
+ {