diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /libXmu/src/CvtStdSel.c | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'libXmu/src/CvtStdSel.c')
| -rw-r--r-- | libXmu/src/CvtStdSel.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/libXmu/src/CvtStdSel.c b/libXmu/src/CvtStdSel.c index 141dfe8df..36423c6fa 100644 --- a/libXmu/src/CvtStdSel.c +++ b/libXmu/src/CvtStdSel.c @@ -242,11 +242,6 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target, return True; } #endif -#ifdef DNETCONN - if (*target == XA_DECNET_ADDRESS(d)) { - return False; /* XXX niy */ - } -#endif if (*target == XA_USER(d)) { char *name = (char*)getenv("USER"); if (name == NULL) return False; @@ -312,14 +307,10 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target, return True; } if (*target == XA_TARGETS(d)) { -#if defined(unix) && defined(DNETCONN) -# define NUM_TARGETS 9 +#if defined(unix) +# define NUM_TARGETS 8 #else -# if defined(unix) || defined(DNETCONN) -# define NUM_TARGETS 8 -# else -# define NUM_TARGETS 7 -# endif +# define NUM_TARGETS 7 #endif Atom* std_targets = (Atom*)XtMalloc(NUM_TARGETS*sizeof(Atom)); int i = 0; @@ -333,9 +324,6 @@ XmuConvertStandardSelection(Widget w, Time time, Atom *selection, Atom *target, #ifdef unix std_targets[i++] = XA_OWNER_OS(d); #endif -#ifdef DNETCONN - std_targets[i++] = XA_DECNET_ADDRESS(d); -#endif *value = (XPointer)std_targets; *type = XA_ATOM; *length = NUM_TARGETS; |