Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.
[bpt/emacs.git] / oldXMenu / ChangeLog
1 2010-11-09 Elias Pipping <pipping.elias@googlemail.com> (tiny change)
2
3 Make Emacs compile with clang (bug#7309).
4 * XMakeAssoc.c (XMakeAssoc):
5 * XDelAssoc.c (XDeleteAssoc): Declare the return type.
6
7 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu>
8
9 * XMenu.h: Include <stdlib.h>.
10
11 2010-07-12 Andreas Schwab <schwab@linux-m68k.org>
12
13 * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
14 substitution.
15 (ALL_CFLAGS): Add ${C_WARNINGS_SWITCH} and ${PROFILING_CFLAGS}.
16
17 2010-07-04 Dan Nicolaescu <dann@ics.uci.edu>
18
19 * Activate.c: Convert function definitions to standard C.
20 * AddPane.c:
21 * AddSel.c:
22 * ChgPane.c:
23 * ChgSel.c:
24 * Create.c:
25 * DelPane.c:
26 * DelSel.c:
27 * Destroy.c:
28 * Error.c:
29 * EvHand.c:
30 * FindPane.c:
31 * FindSel.c:
32 * InsPane.c:
33 * InsSel.c:
34 * Internal.c:
35 * Locate.c:
36 * Post.c:
37 * Recomp.c:
38 * SetAEQ.c:
39 * SetFrz.c:
40 * SetPane.c:
41 * SetSel.c:
42 * X10.h:
43 * XCrAssoc.c:
44 * XDelAssoc.c:
45 * XDestAssoc.c:
46 * XLookAssoc.c:
47 * XMakeAssoc.c:
48 * XMenu.h:
49 * XMenuInt.h:
50 * insque.c: Likewise.
51
52 2010-05-07 Chong Yidong <cyd@stupidchicken.com>
53
54 * Version 23.2 released.
55
56 2010-05-06 Glenn Morris <rgm@gnu.org>
57
58 * Makefile.in (RANLIB): Let configure set it.
59 (libXMenu11.a): Configure sets RANLIB = : on systems without it.
60
61 * Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
62 (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
63
64 2010-05-04 Glenn Morris <rgm@gnu.org>
65
66 * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE):
67 Use @C_SWITCH_SYSTEM@, @C_SWITCH_MACHINE@ rather than
68 @c_switch_system@, @c_switch_machine@.
69
70 2010-04-27 Dan Nicolaescu <dann@ics.uci.edu>
71
72 * Makefile.in (C_SWITCH_X_SYSTEM): Define using autoconf.
73
74 2010-04-23 Dan Nicolaescu <dann@ics.uci.edu>
75
76 * Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.
77
78 2010-04-11 Dan Nicolaescu <dann@ics.uci.edu>
79
80 * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
81 (C_SWITCH_X_SITE): Define using autoconf.
82
83 2010-03-10 Chong Yidong <cyd@stupidchicken.com>
84
85 * Branch for 23.2.
86
87 2009-06-21 Chong Yidong <cyd@stupidchicken.com>
88
89 * Branch for 23.1.
90
91 2008-07-31 Dan Nicolaescu <dann@ics.uci.edu>
92
93 * descrip.mms:
94 * compile.com: Remove file.
95 * Create.c: Remove VMS support.
96
97 2008-07-23 Dan Nicolaescu <dann@ics.uci.edu>
98
99 * Makefile.in (ALL_CFLAGS): Remove reference to C_SWITCH_SITE.
100
101 2007-07-25 Glenn Morris <rgm@gnu.org>
102
103 * Relicense all FSF files to GPLv3 or later.
104
105 2007-06-04 Ulrich Mueller <ulm@gentoo.org> (tiny change)
106
107 * ChgPane.c, ChgSel.c: Quiet --with-x-toolkit=no
108 compilation warnings: #include <config.h>.
109
110 2007-06-02 Chong Yidong <cyd@stupidchicken.com>
111
112 * Version 22.1 released.
113
114 2007-05-30 Ulrich Mueller <ulm@gentoo.org> (tiny change)
115
116 * XMakeAssoc.c (XMakeAssoc): Use malloc rather than xmalloc.
117
118 2007-02-27 Glenn Morris <rgm@gnu.org>
119
120 * Imakefile: Remove unused file with no explicit legal info.
121 * Makefile.in (distclean): Remove Makefile.
122
123 2007-02-25 Glenn Morris <rgm@gnu.org>
124
125 * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c:
126 * XMakeAssoc.c: Remove license text in favour of including
127 copyright.h, as was done in original X11 source.
128
129 2004-12-27 Jan Djärv <jan.h.d@swipnet.se>
130
131 * Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g
132 was pressed.
133
134 2004-11-12 Jan Djärv <jan.h.d@swipnet.se>
135
136 * XMenu.h (XMenuActivateSetWaitFunction): New function.
137
138 * Activate.c (XMenuActivateSetWaitFunction): New function.
139 (XMenuActivate): Call wait_func if set, before XNextEvent.
140
141 2002-04-22 Jan Djärv <jan.h.d@swipnet.se>
142
143 * Activate.c: Add calls to GrabKeyboard to remove strange
144 interactions with window managers that steal keypresses.
145 Call ungrab_all instead of XtUngrabPointer.
146 (XMenuActivate): Add call to XGrabKeyboard.
147 (XMenuActivate): Add call to XUngrabKeyboard.
148
149 2001-10-20 Gerd Moellmann <gerd@gnu.org>
150
151 * (Version 21.1 released.)
152
153 2001-10-05 Gerd Moellmann <gerd@gnu.org>
154
155 * Branch for 21.1.
156
157 2000-07-21 Eli Zaretskii <eliz@is.elta.co.il>
158
159 * Activate.c (XMenuActivate): Call help callback with two more
160 arguments: the pane number and selection number.
161
162 2000-01-27 Gerd Moellmann <gerd@gnu.org>
163
164 * Activate.c (XMenuActivate): Add parameter HELP_CALLBACK.
165 Call help callback.
166
167 * Post.c (XMenuPost): Pass null help callback to XMenuActivate.
168
169 * AddSel.c (XMenuAddSelection): Add parameter HELP.
170
171 * XMenu.h (XmSelect): Add member `help_string'.
172
173 1999-07-12 Richard Stallman <rms@gnu.org>
174
175 * Version 20.4 released.
176
177 1998-08-19 Richard Stallman <rms@psilocin.ai.mit.edu>
178
179 * Version 20.3 released.
180
181 1997-09-19 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
182
183 * Version 20.2 released.
184
185 1997-09-15 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
186
187 * Version 20.1 released.
188
189 1996-08-11 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
190
191 * Version 19.33 released.
192
193 1996-07-31 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
194
195 * Version 19.32 released.
196
197 1996-06-12 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
198
199 * Internal.c (_XMRefreshSelection): Check for type SEPARATOR.
200 * InsSel.c (XMenuInsertSelection): Use SEPARATOR if nec.
201 * AddSel.c (XMenuAddSelection): Use SEPARATOR if nec.
202
203 * XMenu.h: New alternative SEPARATOR.
204
205 1996-05-25 Karl Heuer <kwzh@gnu.ai.mit.edu>
206
207 * Version 19.31 released.
208
209 1995-11-24 Richard Stallman <rms@mole.gnu.ai.mit.edu>
210
211 * Version 19.30 released.
212
213 1995-11-13 Richard Stallman <rms@mole.gnu.ai.mit.edu>
214
215 * Makefile.in (ALL_CFLAGS): Add some -I options.
216
217 * Activate.c, AddPane.c, AddSel.c, Create.c, InsPane.c, InsSel.c:
218 * Internal.c, XCrAssoc.c, XMakeAssoc.c: Include config.h.
219
220 1995-06-19 Richard Stallman <rms@mole.gnu.ai.mit.edu>
221
222 * Version 19.29 released.
223
224 1995-02-07 Richard Stallman <rms@pogo.gnu.ai.mit.edu>
225
226 * Makefile.in (maintainer-clean): Renamed from realclean.
227
228 1994-10-25 Richard Stallman <rms@mole.gnu.ai.mit.edu>
229
230 * Makefile.in (ALL_CFLAGS): Reorder the switches more rationally.
231
232 1994-10-24 Jim Wilson (wilson@chestnut.cygnus.com)
233
234 * Makefile.in (ALL_CFLAGS): Add C_SWITCH_X_MACHINE.
235
236 1994-09-11 Richard Stallman <rms@mole.gnu.ai.mit.edu>
237
238 * Version 19.27 released.
239
240 1994-09-07 Richard Stallman <rms@mole.gnu.ai.mit.edu>
241
242 * Version 19.26 released.
243
244 1994-07-23 Richard Stallman <rms@mole.gnu.ai.mit.edu>
245
246 * Error.c (XMenuError): Make `message' static.
247
248 1994-06-28 Richard Stallman (rms@mole.gnu.ai.mit.edu)
249
250 * Create.c (XAllocDisplayColor): New function.
251 Use it throughout in place of XAllocNamedColor.
252
253 1994-05-30 Richard Stallman (rms@mole.gnu.ai.mit.edu)
254
255 * Version 19.25 released.
256
257 1994-05-23 Richard Stallman (rms@mole.gnu.ai.mit.edu)
258
259 * Version 19.24 released.
260
261 1994-05-17 Karl Heuer (kwzh@hal.gnu.ai.mit.edu)
262
263 * Create.c (XMenuCreate): Declare `data' as char*.
264
265 1994-05-16 Richard Stallman (rms@mole.gnu.ai.mit.edu)
266
267 * Version 19.23 released.
268
269 1994-04-12 Richard Stallman (rms@mole.gnu.ai.mit.edu)
270
271 * Create.c (XMenuCreate): Declare `data' as unsigned char*.
272
273 1994-01-03 Richard Stallman (rms@mole.gnu.ai.mit.edu)
274
275 * XMakeAssoc.c (XMakeAssoc): Use xmalloc.
276 (_XIOErrorFunction): Decl deleted.
277
278 1993-11-27 Richard Stallman (rms@mole.gnu.ai.mit.edu)
279
280 * Version 19.22 released.
281
282 1993-11-26 Richard Stallman (rms@mole.gnu.ai.mit.edu)
283
284 * Activate.c (XMenuActivate):
285 Call XSetWindowBackground and _XMRefreshPane.
286
287 1993-11-16 Richard Stallman (rms@mole.gnu.ai.mit.edu)
288
289 * Version 19.21 released.
290
291 1993-11-13 Richard Stallman (rms@mole.gnu.ai.mit.edu)
292
293 * Makefile.in (libXMenu11.a): Tell make not to worry if ranlib fails.
294 Tell user too, in case make doesn't pay attention.
295
296 1993-11-11 Richard Stallman (rms@mole.gnu.ai.mit.edu)
297
298 * Version 19.20 released.
299
300 1993-10-25 Brian J. Fox (bfox@albert.gnu.ai.mit.edu)
301
302 * Makefile.in (ALL_CFLAGS): Add C_SWITCH_X_SYSTEM.
303
304 1993-09-27 Brian J. Fox (bfox@valhalla)
305
306 * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): Allow
307 `configure' to supply the values for these variables.
308
309 1993-09-26 Brian J. Fox (bfox@ai.mit.edu)
310
311 * Makefile.in (VPATH, srcdir): Now that `configure' creates the
312 Makefiles, do not append the current directory to the value of
313 `srcdir' or `VPATH'.
314
315 1993-08-14 Richard Stallman (rms@mole.gnu.ai.mit.edu)
316
317 * Version 19.19 released.
318
319 1993-08-08 Richard Stallman (rms@mole.gnu.ai.mit.edu)
320
321 * Version 19.18 released.
322
323 1993-07-30 Richard Stallman (rms@mole.gnu.ai.mit.edu)
324
325 * Internal.c (_XMWinQueInit): Use explicit loop, not bzero.
326
327 1993-07-27 Richard Stallman (rms@mole.gnu.ai.mit.edu)
328
329 * Makefile (ALL_CFLAGS): Use all 6 C_SWITCH_... vars.
330
331 Among them, put the ..._SITE vars last.
332
333 1993-07-18 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
334
335 * Version 19.17 released.
336
337 1993-07-07 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
338
339 * Makefile.in: Write out the dependencies for the object files;
340 otherwise, VPATH won't work.
341
342 * Makefile.in: Re-arrange, to put `all' target at the top.
343
344 1993-07-06 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
345
346 * Version 19.16 released.
347
348 1993-06-19 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
349
350 * version 19.15 released.
351
352 1993-06-18 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
353
354 * Makefile.in (ALL_CFLAGS): Always #define EMACS_BITMAP_FILES.
355 This should make it work under any circumstances.
356
357 * Makefile.in (mostlyclean): Use rm -f.
358
359 1993-06-17 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
360
361 * Version 19.14 released.
362
363 1993-06-17 Richard Stallman (rms@mole.gnu.ai.mit.edu)
364
365 * Makefile.in (ALL_CFLAGS): Include C_SWITCH_MACHINE, and CPPFLAGS.
366 Put CFLAGS last.
367
368 1993-06-16 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
369
370 Bring mumbleclean targets into conformance with GNU coding standards.
371 * Makefile.in (mostlyclean, realclean): New targets.
372
373 1993-06-08 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
374
375 * Version 19.13 released.
376
377 1993-05-30 Richard Stallman (rms@mole.gnu.ai.mit.edu)
378
379 * Version 19.10 released.
380
381 1993-05-29 Richard Stallman (rms@mole.gnu.ai.mit.edu)
382
383 * Create.c: Handle EMACS_BITMAP_FILES.
384 Use new names of renamed bitmap files.
385
386 1993-05-28 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
387
388 * AddPane.c, AddSel.c, DelPane.c, DelSel.c, InsPane.c, InsSel.c,
389 XDelAssoc.c, XMakeAssoc.c, XMenu.h, insque.c: Changed all uses of
390 insque and remque to emacs_insque and emacs_remque, so we can
391 safely include insque.c in the library on all systems.
392
393 1993-05-27 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
394
395 * Makefile.in (.c.o): Use $< instead of ${srcdir}/$*.c; the latter
396 only works with GNU Make.
397
398 1993-05-27 Richard Stallman (rms@mole.gnu.ai.mit.edu)
399
400 * Create.c (XMenuCreate): Use classes PaneFont and SelectionFont.
401
402 1993-05-27 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
403
404 * Version 19.9 released.
405
406 1993-05-27 Richard Stallman (rms@mole.gnu.ai.mit.edu)
407
408 * Create.c (XMenuCreate): Use x_get_resource_string, not XGetDefault.
409
410 1993-05-24 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu)
411
412 * Version 19.8 released.
413
414 1993-05-23 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
415
416 * Makefile.in (C_SWITCH_X_SITE): New variable, so that the
417 configuration process can correctly implement the --x-includes
418 option.
419
420 1993-05-22 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
421
422 * Create.c (XMenuCreate): Initialize the menu's pixmaps to None,
423 not NULL.
424
425 1993-05-22 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
426
427 * Version 19.7 released.
428
429 1993-05-15 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
430
431 * Makefile.in: Renamed from Makefile, so that the top-level
432 makefile can edit it.
433
434 1993-04-13 Jim Blandy (jimb@totoro.cs.oberlin.edu)
435
436 * XLookAssoc.c, XMakeAssoc.c: VMS needs <X11/Xresource.h>, not
437 <X11/Xos.h>.
438
439 * XCrAssoc.c: #include <errno.h>, not "errno.h".
440 (XCreateAssocTable): Doc fix.
441
442 1993-03-24 Jim Blandy (jimb@geech.gnu.ai.mit.edu)
443
444 * Makefile (.c.o): Include C_SWITCH_SITE and C_SWITCH_SYSTEM in
445 the options to the C compiler.
446
447 * compile.com, descrip.mms: New files for VMS from Richard
448 Levitte.
449 * XCrAssoc.c, XLookAssoc.c, XDestAssoc.c, XDelAssoc.c: Use <angle
450 brackets> around the names of the X Windows #include files; VMS
451 needs this.
452 * XLookAssoc.c, XMakeAssoc.c: #include <X11/Xos.h>. VMS needs
453 this.
454 * Create.c: On VMS, we have to look for the bitmap files in
455 `./src/bitmaps', not <X11/bitmaps>.
456
457 1993-03-14 Richard Stallman (rms@mole.gnu.ai.mit.edu)
458
459 * Makefile (.c.o): Don't rm the .o files.
460
461 1993-03-13 Richard Stallman (rms@mole.gnu.ai.mit.edu)
462
463 * Activate.c (XMenuActivate): If `active' field is negative,
464 don't allow selecting a string.
465
466 1993-03-09 Jim Blandy (jimb@totoro.cs.oberlin.edu)
467
468 * Create.c (XMenuCreate): New variable `root', holding the
469 display's default root window, so we don't have to write out
470 "RootWindow (display, DefaultScreen (display))" a jillion times.
471
472 * Create.c (XMenuCreate): Don't assume that all the
473 <X11/bitmaps/foo> patterns are 16x16. Instead of building a
474 bitmap and then converting it to a pixmap of the appropriate
475 depth if necessary, build a pixmap of the appropriate depth
476 directly, using XCreatePixmapFromBitmapData.
477
478 * Imakefile: Include XCrAssoc.c, XDelAssoc.c, XDestAssoc.c,
479 XLookAssoc.c, and XMakeAssoc.c in SRCS. Similarly for OBJS.
480
481 * XMenuInt.h: #include <stdio.h> before <X11/Xlib.h>, to avoid
482 warnings about redefining NULL.
483
484 * XMakeAssoc.c, XLookAssoc.c, XDestAssoc.c, XDelAssoc.c,
485 XCrAssoc.c: #include X11/Xlib.h instead of X11/Xlibint.h.
486
487 * XMakeAssoc.c, XLookAssoc.c, XCrAssoc.c: If NULL isn't defined by
488 any of the `.h' files, define it.
489
490 * XMakeAssoc.c, XCrAssoc.c: #include <errno.h>.
491 Add an extern declaration for errno.
492
493 * XMakeAssoc.c: Add an extern declaration for _XIOErrorFunction.
494 (XMakeAssoc): Use malloc instead of Xmalloc to allocate new
495 parts of the assoc table.
496 * XCrAssoc.c (XCreateAssocTable): Same.
497
498 * XDestAssoc.c (XDestroyAssocTable): Use free instead of Xfree.
499 * XDelAssoc.c (XDeleteAssoc): Same.
500
501 1992-10-18 Richard Stallman (rms@mole.gnu.ai.mit.edu)
502
503 * XMakeAssoc.c (XMakeAssoc): Use malloc, not Xmalloc.
504 * XCrAssoc.c (XCreateAssocTable): Use malloc and calloc directly.
505 * XDelAssoc.c (XDeleteAssoc): Use free, not Xfree.
506 * XDestAssoc.c (XDestroyAssocTable): Likewise.
507
508 1992-10-17 Richard Stallman (rms@mole.gnu.ai.mit.edu)
509
510 * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
511 Use Xlib.h, not Xlibint.h.
512 * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Defined.
513 * XMakeAssoc.c, XCrAssoc.c: Include errno.h. Declare errno.
514 * XMakeAssoc.c (_XIOErrorFunction): Declared.
515
516 1992-09-19 Richard Stallman (rms@mole.gnu.ai.mit.edu)
517
518 * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
519 Specify dir X11/ when including Xlibint.h.
520
521 1992-09-17 Richard Stallman (rms@mole.gnu.ai.mit.edu)
522
523 * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
524 New files.
525
526 * Makefile (SRCS, OBJS): Compile those files.
527
528 1992-01-31 Richard Stallman (rms@mole.gnu.ai.mit.edu)
529
530 * Makefile (clean): Delete object files and library.
531 (distclean): New target.
532
533 1992-01-29 Richard Stallman (rms@mole.gnu.ai.mit.edu)
534
535 * Makefile (libXMenu11.a): Put `-' on ranlib line.
536
537 1992-01-27 Richard Stallman (rms@mole.gnu.ai.mit.edu)
538
539 * Makefile (EXTRA): New variable.
540 (libXMenu11.a): Use that.
541
542 * insque.c: New file.
543
544 1992-01-26 Richard Stallman (rms@mole.gnu.ai.mit.edu)
545
546 * Makefile (CC): Assignment commented out.
547
548 1991-11-16 Noah Friedman (friedman@nutrimat)
549
550 * copyright.h: New file (copied from X11R4 distribution)
551 * All files: Replaced occurrences of #include <X11/copyright.h>
552 with #include "copyright.h"
553
554 1991-10-25 Richard Stallman (rms@mole.gnu.ai.mit.edu)
555
556 * XMenu.h (enum _xmmode): Remove spurious comma.
557
558 * X10.h: New file.
559 * XMenu.h, XMenuInt.h: Include X10.h from this dir.
560
561 1990-11-13 Richard Stallman (rms@mole.ai.mit.edu)
562
563 * XMenu.h (struct _xmenu): Use unsigned long for colors.
564
565 1990-11-12 Richard Stallman (rms@mole.ai.mit.edu)
566
567 * Internal.c: Declare argument `display' in some functions.
568
569
570 ;; Local Variables:
571 ;; coding: utf-8
572 ;; add-log-time-zone-rule: t
573 ;; End:
574
575 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
576 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
577 Free Software Foundation, Inc.
578
579 This file is part of GNU Emacs.
580
581 GNU Emacs is free software: you can redistribute it and/or modify
582 it under the terms of the GNU General Public License as published by
583 the Free Software Foundation, either version 3 of the License, or
584 (at your option) any later version.
585
586 GNU Emacs is distributed in the hope that it will be useful,
587 but WITHOUT ANY WARRANTY; without even the implied warranty of
588 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
589 GNU General Public License for more details.
590
591 You should have received a copy of the GNU General Public License
592 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
593
594 ;;; arch-tag: 8b17c869-6677-40ce-be86-e62cf34061cf