From 6aa18cc28c4adee20b7a6494c8acb430380c4c98 Mon Sep 17 00:00:00 2001 From: Oleksandr Shneyder Date: Tue, 10 Feb 2015 19:21:35 +0100 Subject: X2Go icon when run with x2goagent flavour (201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch). Depending on the binary name of the agent either nxagent.xpm or x2go.xpm is used as window icon. --- ...t_set-x2go-icon-if-x2goagent-flavour.full.patch | 219 --------------------- 1 file changed, 219 deletions(-) delete mode 100644 debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch (limited to 'debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch') diff --git a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch b/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch deleted file mode 100644 index 48e4c4a4b..000000000 --- a/debian/patches/201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch +++ /dev/null @@ -1,219 +0,0 @@ -Description: X2Go icon when run with x2goagent flavour - Depending on the binary name of the agent either nxagent.xpm - or x2go.xpm is used as window icon. -Forwarded: not-needed -Author: Oleksandr Shneyder -Last-Update: 2012-01-11 ---- a/nx-X11/programs/Xserver/hw/nxagent/Display.c -+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c -@@ -77,6 +77,7 @@ - #include "NXlib.h" - - #include NXAGENT_ICON_NAME -+#include X2GOAGENT_ICON_NAME - - /* - * Set here the required log level. -@@ -1941,12 +1942,29 @@ - Bool success = False; - XlibPixmap IconPixmap; - XlibPixmap IconShape; -+ char* agent_icon_name; -+ char* agentIconData; - -- snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", NXAGENT_ICON_NAME); -+ /* -+ * selecting x2go icon when running as X2Go agent -+ */ -+ if(nxagentX2go) -+ { -+ agent_icon_name=X2GOAGENT_ICON_NAME; -+ agentIconData=x2goagentIconData; -+ } -+ else -+ { -+ agent_icon_name=NXAGENT_ICON_NAME; -+ agentIconData=nxagentIconData; -+ } -+ -+ -+ snprintf(default_path, PATH_MAX-1, "/usr/NX/share/images/%s", agent_icon_name); - - if ((icon_fp = fopen(default_path, "r")) == NULL) - { -- icon_fp = nxagentLookForIconFile(NXAGENT_ICON_NAME, "r", icon_path); -+ icon_fp = nxagentLookForIconFile(agent_icon_name, "r", icon_path); - - if (icon_fp != NULL) - { -@@ -1985,7 +2003,7 @@ - { - status = XpmCreatePixmapFromData(display, - DefaultRootWindow(display), -- nxagentIconData, -+ agentIconData, - &IconPixmap, - &IconShape, - NULL); ---- a/nx-X11/programs/Xserver/hw/nxagent/Icons.h -+++ b/nx-X11/programs/Xserver/hw/nxagent/Icons.h -@@ -24,6 +24,8 @@ - - #define NXAGENT_ICON_NAME "nxagent.xpm" - -+#define X2GOAGENT_ICON_NAME "x2go.xpm" -+ - #define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm" - - #endif /* __Icons_H__ */ ---- /dev/null -+++ b/nx-X11/programs/Xserver/hw/nxagent/x2go.xpm -@@ -0,0 +1,148 @@ -+/* XPM */ -+static char *x2goagentIconData[]={ -+"128 128 17 1", -+". c None", -+"m c #323232", -+"l c #323232", -+"f c #323232", -+"e c #323232", -+"o c #323232", -+"# c #323232", -+"h c #323232", -+"i c #323232", -+"n c #323232", -+"d c #323232", -+"a c #323232", -+"g c #323232", -+"j c #323232", -+"b c #323232", -+"k c #323232", -+"c c #323232", -+".....#abccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbde.....", -+"...fbccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccgf...", -+"..#ccccaheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeijccckf..", -+".ecccgl..................................................................................................................ejcckf.", -+".bccd.....................................................................................................................mdccg.", -+"#cca.......................................................................................................................mjcce", -+"gckm........................................................................................................................eccd", -+"ccn..........................................................................................................................jcb", -+"cce..........................................................................................................................icc", -+"ccm..........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc............................................meeee..........................................................................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccc....#ggggggggggggggggggggggggggggf.............ggggggggggggggggggggggf....ecc", -+"cc....meeeeoiiiiiiiinggggggggjccccccccccccccccccccc....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", -+"cc....................................meeeeeeeeoiii....icccccccccccccccccccccccccccce.............cccccccccccccccccccccce....ecc", -+"cc.......................................................menbccccccccccccccccccbhe..................logccccccccccccghe.......ecc", -+"cc...........................................................iccccccccccccccccdm.......................#cccccccccke..........ecc", -+"cc..............................................lee...........#cccccccccccccckm.........................jccccccckm...........ecc", -+"cc........feeeeeeeeoiiiiiiiiiaggggggggjcccccccccccc............icccccccccccccd..........................icccccccf............ecc", -+"cc....meeeeeoiiiiiiiinggggggggjcccccccccccccccccccciiiiii#m.....jcccccccccccci..........................icccccci.............ecc", -+"cc......................................eeeeeeeeeiiiiiiiiigl....eccccccccccccd..........................dcccccj..............ecc", -+"cc...............................................................dcccccccccccj..........................bccccce..............ecc", -+"cc...............................................................lccccccccccccl........................lccccca...............ecc", -+"cc.............................................meeeeeeee#iiiie....dccccccccccch........................icccccl...............ecc", -+"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccb....ecccccccccccb........................bccccn................ecc", -+"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccc#....gccccccccccco......................#cccckm................ecc", -+"cc....................................meeeeeeeeeiiiiiiiiiaggggd....#cccccccccccg......................bcccci.................ecc", -+"cc..................................................................bcccccccccccf....................#cccckm.................ecc", -+"cc..................................................................hcccccccccccd...................mkcccci..................ecc", -+"cc............................................meeeeeeeeoiiiiiiiil...mkcccccccccccl..................icccckm..................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccn....dccccccccccci.................mkcccci...................ecc", -+"cc....meeeeeiiiiiiiiiaggggggggbccccccccccccccccccccccccccccccccckm...lccccccccccck.................icccckm...................ecc", -+"cc.....................................leeeeeeeeoiiiiiiiiigggggggo....accccccccccc#...............mkcccch....................ecc", -+"cc....................................................................ecccccccccccb...............iccccb.....................ecc", -+"cc.....................................................................jccccccccccce.............mkcccc#.....................ecc", -+"cc.............................................meeeeeeeeehiiiiiiii#....#ccccccccccca.............nccccb......................ecc", -+"cc........feeeeeeee#iiiiiiiiigggggggggkccccccccccccccccccccccccccccl....kcccccccccccl...........lccccc#......................ecc", -+"cc....meeeeeoiiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccd....icccccccccccd...........dccccb.......................ecc", -+"cc......................................leeeeeeeeoiiiiiiiingggggggga....mccccccccccckm.........lccccc#.......................ecc", -+"cc.......................................................................dccccccccccch.........dccccb........................ecc", -+"cc.......................................................................lcccccccccccb........lccccc#........................ecc", -+"cc.............................................meeeeeeeeoiiiiiiiingggo....gccccccccccc#.......dccccg.........................ecc", -+"cc.........meeeeeeeeoiiiiiiiinggggggggjccccccccccccccccccccccccccccccg....occcccccccccg......lccccce.........................ecc", -+"cc....meeeeiiiiiiiiiaggggggggbcccccccccccccccccccccccccccccccccccccccce....bccccccccccce.....gccccg..........................ecc", -+"cc....................................meeeeeeeeeiiiiiiiiigggggggggkcccd....#cccccccccccd....eccccce..........................ecc", -+"cc.........................................................................mkcccccccccccl...gccccg...........................ecc", -+"cc..........................................................................nccccccccccci..eccccce...........................ecc", -+"cc............................................meeeeeeeeoiiiiiiiingggggggm...lccccccccccckm.gccccg............................ecc", -+"cc.........eeeeeeeeoiiiiiiiinggggggggjcccccccccccccccccccccccccccccccccc#....dccccccccccc#eccccce............................ecc", -+"cc....meeeeeiiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccccccccccb....ecccccccccccbgccccg.............................ecc", -+"cc.....................................leeeeeeeeoiiiiiiiiigggggggggkccccco....gccccccccccccccccl.............................ecc", -+"cc............................................................................#cccccccccccccccd..............................ecc", -+"cc.............................................................................bccccccccccccccl..............................ecc", -+"cc.............................................leeeeeeeeeiiiiiiiiiagggggggi....icccccccccccccd...............................ecc", -+"cc........feeeeeeee#iiiiiiiingggggggggkccccccccccccccccccccccccccccccccccckm...mkccccccccccccl...............................ecc", -+"cc....meeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccccccccci....dccccccccccca................................ecc", -+"cc......................................leeeeeeeeoiiiiiiiiigggggggggccccccck....lccccccccccckm...............................ecc", -+"cc...............................................................................accccccccccc#...............................ecc", -+"cc...............................................................................ecccccccccccb...............................ecc", -+"cc............................................leeeeeeeeeiiiiiiiiiaggggggggbcce....bccccccccccce..............................ecc", -+"cc.......feeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccccccccccccccd....#cccccccccccg..............................ecc", -+"cc....meeeeeeoiiiiiiiingggggggggccccccccccccccccccccccccccccccccccccccccccccccl....kcccccccccccl.............................ecc", -+"cc.......................................feeeeeeeehiiiiiiiidggggggggbccccccccci....ncccccccccccd.............................ecc", -+"cc...........................................................................mm....bccccccccccccm............................ecc", -+"cc................................................................................#ccccccccccccci............................ecc", -+"cc..........................................leeeeeeee#iiiiiiiidggggggggbcccccl....bccccccccccccck............................ecc", -+"cc......feeeeeeeehiiiiiiiiaggggggggkccccccccccccccccccccccccccccccccccccccccd....#ccccccccccccccc#...........................ecc", -+"cc....meeeeeee#iiiiiiiidggggggggjcccccccccccccccccccccccccccccccccccccccccccl....bcccccccccccccccb...........................ecc", -+"cc.......................................meeeeeeeeeiiiiiiiiigggggggggkcccccd....#cccccbccccccccccce..........................ecc", -+"cc..............................................................................bccccdhcccccccccccg..........................ecc", -+"cc.............................................................................#ccccclmkcccccccccccl.........................ecc", -+"cc..........................................meeeeeeeeeiiiiiiiiiaggggggggbkm....bccccd..ncccccccccccd.........................ecc", -+"cc.....leeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccccci....hcccckl..lccccccccccccm........................ecc", -+"cc....meeeeeeeehiiiiiiiidggggggggbcccccccccccccccccccccccccccccccccccccckm...mkcccci....dccccccccccci........................ecc", -+"cc........................................leeeeeeee#iiiiiiiinggggggggjcci....icccckm....eccccccccccck........................ecc", -+"cc..........................................................................mkcccci......gccccccccccc#.......................ecc", -+"cc..........................................................................icccckm......#cccccccccccb.......................ecc", -+"cc.........................................leeeeeeeeoiiiiiiiiigggggggga....mkcccci........bccccccccccce......................ecc", -+"cc....meeeeeeeeoiiiiiiiiigggggggggkccccccccccccccccccccccccccccccccccci....icccckm........hcccccccccccg......................ecc", -+"cc.....feeeeeeeehiiiiiiiiaggggggggkcccccccccccccccccccccccccccccccccckm...mkcccci.........mkcccccccccccl.....................ecc", -+"cc.........................................feeeeeeeehiiiiiiiiagggggggh....icccckm..........icccccccccccd.....................ecc", -+"cc.......................................................................mkcccci...........lccccccccccccm....................ecc", -+"cc.......................................................................icccckm............dccccccccccci....................ecc", -+"cc...........................................eeeeeeeeehiiiiiiiidggga....mkcccci.............fccccccccccck....................ecc", -+"cc......feeeeeeee#iiiiiiiingggggggggccccccccccccccccccccccccccccccci....iccccb...............gccccccccccc#...................ecc", -+"cc....meeeeeeeoiiiiiiiiigggggggggbcccccccccccccccccccccccccccccccckm...mkcccc#...............occcccccccccb...................ecc", -+"cc........................................meeeeeeeeeiiiiiiiiidgggg#....iccccb.................bccccccccccce..................ecc", -+"cc....................................................................mkcccc#.................#cccccccccccg..................ecc", -+"cc....................................................................iccccb..................mkcccccccccccl.................ecc", -+"cc..........................................eeeeeeeeeiiiiiiiiiaga....mkcccc#...................icccccccccccd.................ecc", -+"cc.....leeeeeeee#iiiiiiiinggggggggjccccccccccccccccccccccccccccci....iccccb....................lccccccccccccm................ecc", -+"cc....meeeeeeee#iiiiiiiiigggggggggkcccccccccccccccccccccccccccckm...mkcccc#.....................dccccccccccci................ecc", -+"cc.........................................leeeeeeeeoiiiiiiiiiah....iccccb......................lccccccccccck................ecc", -+"cc.................................................................mkcccc#.......................gccccccccccc#...............ecc", -+"cc.................................................................dccccj........................ecccccccccccj...............ecc", -+"cc..........................................leeeeeeeeeiiiiiiih....lccccce.........................bccccccccccce..............ecc", -+"cc....meeeeeeeeeiiiiiiiiidgggggggggcccccccccccccccccccccccccci....dccccg..........................#ccccccccccca..............ecc", -+"cc.....feeeeeeeeiiiiiiiinggggggggbcccccccccccccccccccccccccckm...lccccce...........................kcccccccccccl.............ecc", -+"cc........................................leeeeeeeehiiiiiiiih....dccccg............................ncccccccccccd.............ecc", -+"cc..............................................................lccccce............................fccccccccccccf............ecc", -+"cc..............................................................dccccb..............................jcccccccccccg............ecc", -+"cc.........................................meeeeeeeeoiiiiil....lcccccn..............................icccccccccccce...........ecc", -+"cc......feeeeeeeehiiiiiiiigggggggggccccccccccccccccjgggggo.....gccccc#..............................eccccccccccccbm..........ecc", -+"cc....meeeeeeeoiiiiiiiiidgggggggggccccccccccccccccc...........hcccccco...............................cccccccccccccn..........ecc", -+"cc.........................................leeeeeee..........ecccccccn..............................lcccccccccccccc#.........ecc", -+"cc..........................................................#kccccccckf.............................nccccccccccccccc#........ecc", -+"cc........................................................ldcccccccccck#m.........................lncccccccccccccccccdl......ecc", -+"cc.........................................feeeeeee....ogjcccccccccccccccggi..................oggbcccccccccccccccccccccja....ecc", -+"cc.....leeeeeeee#iiiiiiiidggggggggbcccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", -+"cc....meeeeeeeehiiiiiiiiaggggggggkccccccccccccccccc....icccccccccccccccccccg..................icccccccccccccccccccccccccc....ecc", -+"cc........................................feeeeeeee..........................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cc...........................................................................................................................ecc", -+"cce..........................................................................................................................hcc", -+"ccn..........................................................................................................................acb", -+"jcb.........................................................................................................................lcca", -+"hcci........................................................................................................................acc#", -+"mkcc#......................................................................................................................dccb.", -+".occci...................................................................................................................macccf.", -+"..#cccbne.............................................................................................................menkccc#..", -+"...okccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccbe...", -+"....mhjccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccg#....."}; -- cgit v1.2.3