diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2007-05-03 15:21:31 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2007-05-03 15:21:31 (GMT) |
| commit | b4a1780d87be0a45798fe19a90a8317bf235404a (patch) | |
| tree | 4b65e0e57b4ff5c4424e1dd85c980a9425cd118c /generic/tkOption.c | |
| parent | 458541e13fd91e5f1323f40e835d5d9fca59d32c (diff) | |
| download | tk-b4a1780d87be0a45798fe19a90a8317bf235404a.zip tk-b4a1780d87be0a45798fe19a90a8317bf235404a.tar.gz tk-b4a1780d87be0a45798fe19a90a8317bf235404a.tar.bz2 | |
Tackle [Bug 1711985]
Diffstat (limited to 'generic/tkOption.c')
| -rw-r--r-- | generic/tkOption.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkOption.c b/generic/tkOption.c index b26e57e..b930f8c 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkOption.c,v 1.19 2007/04/17 14:36:49 dkf Exp $ + * RCS: @(#) $Id: tkOption.c,v 1.20 2007/05/03 15:21:32 dkf Exp $ */ #include "tkPort.h" @@ -1569,7 +1569,7 @@ GetDefaultOptions( TkWindow *winPtr) /* Fetch option defaults for main window * associated with this. */ { - char *regProp; + char *regProp, **regPropPtr = ®Prop; int result, actualFormat; unsigned long numItems, bytesAfter; Atom actualType; @@ -1580,10 +1580,9 @@ GetDefaultOptions( regProp = NULL; result = XGetWindowProperty(winPtr->display, - RootWindow(winPtr->display, 0), - XA_RESOURCE_MANAGER, 0, 100000, - False, XA_STRING, &actualType, &actualFormat, - &numItems, &bytesAfter, (unsigned char **) ®Prop); + RootWindow(winPtr->display, 0), XA_RESOURCE_MANAGER, 0, 100000, + False, XA_STRING, &actualType, &actualFormat, &numItems, + &bytesAfter, (unsigned char **) regPropPtr); if ((result == Success) && (actualType == XA_STRING) && (actualFormat == 8)) { |