Unverified Commit d3bbca71 authored by Mike Gabriel's avatar Mike Gabriel

Merge branch 'sunweaver-pr/drop-nomachine-icon' into 3.6.x

Attributes GH PR #687: https://github.com/ArcticaProject/nx-libs/pull/687 Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Fri, 24 Aug 2018 21:47:34 +0000 (UTC)
parents 930bd283 31ac5a17
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<!-- copyright: 2006, Marian Sigler -->
<!-- license: Public Domain -->
<!-- URL: https://en.wikipedia.org/wiki/File:X11.svg -->
<!-- Comment: Self-drawn using Inkscape and gedit, based on X11.png
https://commons.wikimedia.org/wiki/File:X11.png -->
<svg
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="275"
height="275"
id="svg2">
<defs
id="defs4" />
<g
transform="translate(-295.17857,-338.61217)"
id="layer1">
<path
d="m 296.78571,612.63003 c 0,0 104.06285,-132.7859 104.06285,-132.7859 0,0 -104.06285,-140.24982 -104.06285,-140.24982 l 67.30299,0 c 0,0 83.34749,113.48826 83.34749,113.48826 l -126.86477,159.54746 -23.78571,0 z M 417.28794,500.06578 544.11662,339.59431 c 0,0 24.45481,0 24.45481,0 L 464.47749,471.26578 c 0,0 104.09394,141.36425 104.09394,141.36425 l -67.30357,0 c 0,0 -83.97992,-112.56425 -83.97992,-112.56425 z"
id="path2830"
style="fill:#000000" />
</g>
</svg>
...@@ -40,6 +40,7 @@ is" without express or implied warranty. ...@@ -40,6 +40,7 @@ is" without express or implied warranty.
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <libgen.h>
#ifdef __sun #ifdef __sun
#include <strings.h> #include <strings.h>
...@@ -56,6 +57,7 @@ is" without express or implied warranty. ...@@ -56,6 +57,7 @@ is" without express or implied warranty.
#include "servermd.h" #include "servermd.h"
#include "opaque.h" #include "opaque.h"
#include "Init.h"
#include "Agent.h" #include "Agent.h"
#include "Display.h" #include "Display.h"
#include "Args.h" #include "Args.h"
...@@ -124,7 +126,7 @@ extern int _XGetBitsPerPixel(Display *dpy, int depth); ...@@ -124,7 +126,7 @@ extern int _XGetBitsPerPixel(Display *dpy, int depth);
extern char dispatchExceptionAtReset; extern char dispatchExceptionAtReset;
const char *nxagentProgName; char *nxagentProgName;
char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH]; char nxagentDisplayName[NXAGENTDISPLAYNAMELENGTH];
Bool nxagentSynchronize = False; Bool nxagentSynchronize = False;
...@@ -187,7 +189,14 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -187,7 +189,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
* Ensure that the options are set to their defaults. * Ensure that the options are set to their defaults.
*/ */
nxagentProgName = argv[0]; char *basec = strdup(argv[0]);
nxagentProgName = strdup(basename(basec));
free(basec);
/*
* Check if we running as X2Go Agent
*/
checkX2goAgent();
static Bool resetOptions = True; static Bool resetOptions = True;
...@@ -1805,7 +1814,14 @@ N/A ...@@ -1805,7 +1814,14 @@ N/A
if (*nxagentWindowName == '\0') if (*nxagentWindowName == '\0')
{ {
snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX"); if(nxagentX2go)
{
snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "X2Go Agent");
}
else
{
snprintf(nxagentWindowName, NXAGENTWINDOWNAMELENGTH, "NX Agent");
}
} }
/* /*
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define NXAGENT_ICON_NAME "nxagent.xpm" #define NXAGENT_ICON_NAME "nxagent.xpm"
#define X2GOAGENT_ICON_NAME "x2go.xpm" #define X2GOAGENT_ICON_NAME "x2goagent.xpm"
#define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm" #define NXAGENT_PLACEHOLDER_NAME "nxmissing.xpm"
......
...@@ -192,9 +192,9 @@ int nxagentX2go; ...@@ -192,9 +192,9 @@ int nxagentX2go;
* Checking if agent is x2go agent * Checking if agent is x2go agent
*/ */
void checkX2goAgent() void checkX2goAgent(void)
{ {
extern const char *nxagentProgName; extern char *nxagentProgName;
if( strcasecmp(nxagentProgName,"x2goagent") == 0) if( strcasecmp(nxagentProgName,"x2goagent") == 0)
{ {
fprintf(stderr, "\nrunning as X2Go Agent\n"); fprintf(stderr, "\nrunning as X2Go Agent\n");
...@@ -221,11 +221,6 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[]) ...@@ -221,11 +221,6 @@ void InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
#endif #endif
/* /*
* Check if we running as X2Go Agent
*/
checkX2goAgent();
/*
* Print our pid and version information. * Print our pid and version information.
*/ */
......
...@@ -46,6 +46,7 @@ extern int nxagentBackingStore; ...@@ -46,6 +46,7 @@ extern int nxagentBackingStore;
extern int nxagentSaveUnder; extern int nxagentSaveUnder;
extern int nxagentX2go; extern int nxagentX2go;
void checkX2goAgent(void);
extern ServerGrabInfoRec nxagentGrabServerInfo; extern ServerGrabInfoRec nxagentGrabServerInfo;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
/* */ /* */
/**************************************************************************/ /**************************************************************************/
/* XPM */
static char *placeholderXpm[] = { static char *placeholderXpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"14 16 10 1", "14 16 10 1",
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<!-- copyright: 2006, Marian Sigler -->
<!-- license: Public Domain -->
<!-- URL: https://en.wikipedia.org/wiki/File:X11.svg -->
<!-- Comment: Self-drawn using Inkscape and gedit, based on X11.png
https://commons.wikimedia.org/wiki/File:X11.png -->
<svg
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="275"
height="275"
id="svg2">
<defs
id="defs4" />
<g
transform="translate(-295.17857,-338.61217)"
id="layer1">
<path
d="m 296.78571,612.63003 c 0,0 104.06285,-132.7859 104.06285,-132.7859 0,0 -104.06285,-140.24982 -104.06285,-140.24982 l 67.30299,0 c 0,0 83.34749,113.48826 83.34749,113.48826 l -126.86477,159.54746 -23.78571,0 z M 417.28794,500.06578 544.11662,339.59431 c 0,0 24.45481,0 24.45481,0 L 464.47749,471.26578 c 0,0 104.09394,141.36425 104.09394,141.36425 l -67.30357,0 c 0,0 -83.97992,-112.56425 -83.97992,-112.56425 z"
id="path2830"
style="fill:#000000" />
</g>
</svg>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment