remove copy+paste cruft from debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch

1 files changed, 38 insertions, 93 deletions

diff --git a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
index e68d51b44..54e5996d2 100644
--- a/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
+++ b/debian/patches/999_nxagent_unbrand-nxagent-brand-x2goagent.patch
@@ -7,42 +7,8 @@ Description: Unbrand NX Agent Startup Screen / Brand X2Go Agent Startup Screen
 Forwarded: not-needed
 Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 Last-Update: 2012-01-11
---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c2012-01-11 10:09:05.000000000 +0100
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c2012-01-11 14:47:51.000000000 +0100
-@@ -1407,6 +1408,7 @@ FIXME: Use of nxagentParentWindow is str
-     nxagentLogoBlack = 0x000000;
-     nxagentLogoRed   = 0xff0000;
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = 0x222222;
-   }
-   else
-   {
-@@ -1417,6 +1419,7 @@ FIXME: Use of nxagentParentWindow is str
-     nxagentLogoRed   = nxagentLogoColor(0xff0000);
-     nxagentLogoBlack = nxagentLogoColor(0x000000);
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = nxagentLogoColor(0x222222);
-   }
- 
-   #ifdef WATCH
-@@ -2660,6 +2680,7 @@ Bool nxagentReconnectDisplay(void *p0)
-     nxagentLogoBlack = 0x000000;
-     nxagentLogoRed   = 0xff0000;
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = 0x222222;
-   }
-   else
-   {
-@@ -2670,6 +2691,7 @@ Bool nxagentReconnectDisplay(void *p0)
-     nxagentLogoRed   = nxagentLogoColor(0xff0000);
-     nxagentLogoBlack = nxagentLogoColor(0x000000);
-     nxagentLogoWhite = 0xffffff;
-+    nxagentLogoGray  = nxagentLogoColor(0x222222);
-   }
- 
-   useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);
---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c	2012-01-11 10:09:05.000000000 +0100
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c	2012-01-11 15:03:39.000000000 +0100
+--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
 @@ -35,6 +35,7 @@
  #include "Windows.h"
  #include "Atoms.h"
@@ -51,7 +17,7 @@ Last-Update: 2012-01-11
  
  /*
   * Set here the required log level.
-@@ -53,6 +54,7 @@ int nxagentLogoDepth;
+@@ -53,6 +54,7 @@
  int nxagentLogoWhite;
  int nxagentLogoRed;
  int nxagentLogoBlack;
@@ -59,7 +25,7 @@ Last-Update: 2012-01-11
  
  void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height);
  
-@@ -166,6 +168,15 @@ void nxagentPaintLogo(Window win, GC gc,
+@@ -166,6 +168,15 @@
    XPoint    m[12];
    int w, h, c, w2, h2;
  
@@ -75,7 +41,7 @@ Last-Update: 2012-01-11
    #ifdef DEBUG
    fprintf(stderr, "nxagenShowtLogo: Got called.\n");
    #endif
-@@ -218,75 +229,146 @@ void nxagentPaintLogo(Window win, GC gc,
+@@ -218,75 +229,146 @@
    XSetForeground(nxagentDisplay, gc, nxagentLogoRed);
    XSetBackground(nxagentDisplay, gc, nxagentLogoWhite);
  
@@ -262,68 +228,47 @@ Last-Update: 2012-01-11
    XSetWindowBackgroundPixmap(nxagentDisplay, win, nxagentPixmapLogo);
  
    #ifdef NXAGENT_LOGO_DEBUG
---- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h	2012-01-11 10:09:05.000000000 +0100
-+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h	2012-01-11 14:48:05.000000000 +0100
-@@ -33,6 +33,7 @@ extern int nxagentLogoDepth;
+--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
++++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+@@ -33,6 +33,7 @@
  extern int nxagentLogoWhite;
  extern int nxagentLogoRed;
  extern int nxagentLogoBlack;
 +extern int nxagentLogoGray;
  
  extern Window nxagentSplashWindow;
-
---- 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);
+@@ -1408,6 +1408,7 @@
+     nxagentLogoBlack = 0x000000;
+     nxagentLogoRed   = 0xff0000;
+     nxagentLogoWhite = 0xffffff;
++    nxagentLogoGray  = 0x222222;
+   }
+   else
+   {
+@@ -1418,6 +1419,7 @@
+     nxagentLogoRed   = nxagentLogoColor(0xff0000);
+     nxagentLogoBlack = nxagentLogoColor(0x000000);
+     nxagentLogoWhite = 0xffffff;
++    nxagentLogoGray  = nxagentLogoColor(0x222222);
+   }
  
-   if ((icon_fp = fopen(default_path, "r")) == NULL)
+   #ifdef WATCH
+@@ -2678,6 +2680,7 @@
+     nxagentLogoBlack = 0x000000;
+     nxagentLogoRed   = 0xff0000;
+     nxagentLogoWhite = 0xffffff;
++    nxagentLogoGray  = 0x222222;
+   }
+   else
    {
+@@ -2688,6 +2691,7 @@
+     nxagentLogoRed   = nxagentLogoColor(0xff0000);
+     nxagentLogoBlack = nxagentLogoColor(0x000000);
+     nxagentLogoWhite = 0xffffff;
++    nxagentLogoGray  = nxagentLogoColor(0x222222);
+   }
+ 
+   useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);