comparison src/if_xcmdsrv.c @ 819:23f82b5d2814 v7.0c10

updated for version 7.0c10
author vimboss
date Wed, 05 Apr 2006 20:41:53 +0000
parents 52e76e2b5b65
children e63691e7c504
comparison
equal deleted inserted replaced
818:1f929f3ca806 819:23f82b5d2814
1109 int domsg; /* When TRUE give error message. */ 1109 int domsg; /* When TRUE give error message. */
1110 { 1110 {
1111 int result, actualFormat; 1111 int result, actualFormat;
1112 long_u bytesAfter; 1112 long_u bytesAfter;
1113 Atom actualType; 1113 Atom actualType;
1114 XErrorHandler old_handler;
1114 1115
1115 *regPropp = NULL; 1116 *regPropp = NULL;
1117 old_handler = XSetErrorHandler(x_error_check);
1118 got_x_error = FALSE;
1119
1116 result = XGetWindowProperty(dpy, RootWindow(dpy, 0), registryProperty, 0L, 1120 result = XGetWindowProperty(dpy, RootWindow(dpy, 0), registryProperty, 0L,
1117 (long)MAX_PROP_WORDS, False, 1121 (long)MAX_PROP_WORDS, False,
1118 XA_STRING, &actualType, 1122 XA_STRING, &actualType,
1119 &actualFormat, numItemsp, &bytesAfter, 1123 &actualFormat, numItemsp, &bytesAfter,
1120 regPropp); 1124 regPropp);
1125
1126 XSync(dpy, FALSE);
1127 (void)XSetErrorHandler(old_handler);
1128 if (got_x_error)
1129 return FAIL;
1121 1130
1122 if (actualType == None) 1131 if (actualType == None)
1123 { 1132 {
1124 /* No prop yet. Logically equal to the empty list */ 1133 /* No prop yet. Logically equal to the empty list */
1125 *numItemsp = 0; 1134 *numItemsp = 0;