1. 09 Oct, 2008 1 commit
  2. 01 Jul, 2008 1 commit
  3. 30 Jun, 2008 1 commit
    • Cody Russell's avatar
      Practically everything changed. · fce9c8b7
      Cody Russell authored
      2008-06-30  Cody Russell  <bratsche@gnome.org>
      
              * Practically everything changed.
      
              Change	all references	of GIMP	Toolkit	(and variations	of it)
              to GTK+	Toolkit, showing no mercy at all to our	beloved
      	ancestry. (#540529)
      
      
      svn path=/trunk/; revision=20709
      fce9c8b7
  4. 22 Jun, 2008 1 commit
    • Johan Dahlin's avatar
      Include "config.h" instead of <config.h> Command used: find -name · d97cdbdf
      Johan Dahlin authored
      2008-06-21  Johan Dahlin  <jdahlin@async.com.br>
      
          * *.[ch]: Include "config.h" instead of <config.h>
          Command used:
          find -name \*.[ch]|xargs perl -p -i -e 's/^#include <config.h>/#include "config.h"/g'
          Rubberstamped by Mitch and Tim
      
      
      svn path=/trunk/; revision=20669
      d97cdbdf
  5. 27 Feb, 2008 1 commit
    • Michael Natterer's avatar
      gtk/gtkmenushell.c gtk/gtktable.c gtk/gtktext.c gtk/gtktipsquery.c · 45debfb0
      Michael Natterer authored
      2008-02-27  Michael Natterer  <mitch@imendio.com>
      
      	* gtk/gtkmenushell.c
      	* gtk/gtktable.c
      	* gtk/gtktext.c
      	* gtk/gtktipsquery.c
      	* gtk/gtktoolbar.c
      	* gtk/gtktreeitem.c
      	* gtk/gtktreeview.c
      	* gtk/gtkviewport.c
      	* gtk/gtkwin32embedwidget.c: remove g_return_if_fail() from
      	private functions and virtual function implementations.
      
      
      svn path=/trunk/; revision=19668
      45debfb0
  6. 28 Dec, 2007 1 commit
  7. 26 Nov, 2007 1 commit
    • Matthias Clasen's avatar
      Fix up some doc comments to shut up gtk-doc. · 7819005e
      Matthias Clasen authored
      2007-11-26  Matthias Clasen  <mclasen@redhat.com>
      
              * gtk/gtkmain.c:
              * gtk/gtknotebook.c:
              * gtk/gtkplugprivate.h:
              * gtk/gtksocket.c:
              * gtk/gtksocketprivate.h:
              * gtk/gtktable.c: Fix up some doc comments to shut up gtk-doc.
      
      
      svn path=/trunk/; revision=19066
      7819005e
  8. 06 Jul, 2006 1 commit
  9. 14 May, 2006 1 commit
  10. 02 May, 2006 1 commit
  11. 01 Sep, 2005 1 commit
    • Matthias Clasen's avatar
      Intern some more strings. · 94eec042
      Matthias Clasen authored
      2005-09-01  Matthias Clasen  <mclasen@redhat.com>
      
              * gdk/*.c: Intern some more strings.
              * gtk/gtkintl.h:
              * gtk/*.c: Define an I_() macro and use it instead of the
              bulky g_intern_static_string().
      94eec042
  12. 31 Aug, 2005 1 commit
    • Matthias Clasen's avatar
      Intern type names in code generated by glib-mkenums, too. · c09cc893
      Matthias Clasen authored
      2005-08-31  Matthias Clasen  <mclasen@redhat.com>
      
      	* gdk/Makefile.am:
      	* gtk/Makefile.am: Intern type names in code generated by
      	glib-mkenums, too.
      
      	* gtk/*.c:
      	* gdk/x11/*.c:
      	* gdk/*.c: Intern type names before registering the type to avoid
      	unnecessary copies.
      c09cc893
  13. 26 Mar, 2005 1 commit
  14. 22 Mar, 2005 1 commit
  15. 20 Mar, 2005 1 commit
    • Matthias Clasen's avatar
      Make PLT-reduction work with gcc4, and don't include everything in · cca8dd63
      Matthias Clasen authored
      2005-03-20  Matthias Clasen  <mclasen@redhat.com>
      
      	Make PLT-reduction work with gcc4, and don't include
      	everything in gdkalias.h:
      
      	* gtk/grk.symbols: Group symbols by header and source file.
      	* gtk/makegtkalias.pl: Protect definitions by the same
      	preprocessor symbols used to guard the headers. Move
      	the alias declarations to a separate file which is
      	produced when calling makegtkalias.pl -def
      	* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
      	this file.
      	* gtk/*.c: Include gtkalias.h after the other headers,
      	include gtkaliasdef.c at the bottom.
      	* gtk/*.h: Small cleanups.
      cca8dd63
  16. 09 Mar, 2005 1 commit
  17. 09 Aug, 2004 1 commit
    • Matthias Clasen's avatar
      Add hidden aliases for exported symbols which are used internally in order · 3612aee5
      Matthias Clasen authored
      Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>
      
      	Add hidden aliases for exported symbols which are
      	used internally in order to get rid of many PLT
      	entries.  (#145519, Arjan van de Ven)
      
      	* gtk/Makefile.am: Add rules to generate gtk.def and
      	from gtk.symbols, and make make check check the abi
      	with abicheck.sh.
      	(gtk_private_h_sources): Add gtkinternals.h
      	(gtk_built_private_headers): Add gtkalias.h
      	(gtk_extra_sources): Add gtk.symbols
      	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh
      
      	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
      	The file can be processed by cpp to filter out certain
      	subsets of symbols.
      
      	* gtk/abicheck.sh: New file. Script to check the actually
      	symbols exported from libgtk-x11.2.0.so against the symbols
      	found in gtk.symbols.
      
      	* gtk/makegtkalias.pl: New file. Perl script to generate the
      	header containing the alias definitions for internally used
      	exported symbols from a list of symbols.
      
      	* gtk/gtkinternals.h: New file. An uninstalled header listing
      	symbols which must be exported for some reason and do not appear
      	in any other header.
      
      	* gtk/*.c: Include gtkalias.h
      3612aee5
  18. 06 Mar, 2004 1 commit
  19. 16 Jan, 2004 1 commit
    • Matthias Clasen's avatar
      The first part of the fix for #114351 (see also gdk-pixbuf/ChangeLog and · 07d4d314
      Matthias Clasen authored
      Fri Jan 16 23:59:01 2004  Matthias Clasen  <maclas@gmx.de>
      
      	The first part of the fix for #114351 (see also
      	gdk-pixbuf/ChangeLog and po/ChangeLog):
      
      	* gtk/gtkintl.h:
      	* gdk-pixbuf/gdk-pixbuf-i18n.h:
      	* gdk/gdkintl.h: Define P_() for property blurbs and nicks.
      
      	* gdk/gdkdisplaymanager.c:
      	* gdk-pixbuf/gdk-pixbuf.c:
      	* modules/input/gtkimcontextxim.c:
      	* gtk/*.c:  Mark property blurbs and nicks with P_().
      
      	* po/Makefile.in.in: Add --keyword=P_ to the xgettext
      	invocation, since property blurbs and nicks are
      	now marked with P_().
      07d4d314
  20. 06 Oct, 2003 1 commit
  21. 20 Jan, 2003 1 commit
    • Soeren Sandmann's avatar
      Fix assertion. · 4238d557
      Soeren Sandmann authored
      Mon Jan 20 13:59:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
      
              * gtk/gtktable.c (gtk_table_resize): Fix assertion.
      4238d557
  22. 13 Oct, 2002 1 commit
    • Soeren Sandmann's avatar
      Documentation fixes. · a130f089
      Soeren Sandmann authored
      Sun Oct 13 18:50:14 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
      
      	* gtkmenu.c, gtkmenu.sgml, gtkitemfactory.c, gdkwindow.c,
      	gtkwindow.c, gtkpaned.sgml, gtkdialog.c, gtkbox.h, gtkbutton.sgml,
      	gtktreemodel.sgml,gtktable.sgml, gtktable.c:
      
      	Documentation fixes.
      
      	#85719, #90759, #95169, Owen Taylor;
      	#89221, Yao Zhang, Matthias Clasen;
      	#95592, Joost Faassen;
      	#92637, Vitaly Tishkov;
      	#94616, Ben Martin;
      	#94772, sbaillie@bigpond.net.au;
      a130f089
  23. 10 Oct, 2002 1 commit
    • Manish Singh's avatar
      Deprecation cleanup · 28bc5303
      Manish Singh authored
      Wed Oct  9 17:40:13 2002  Manish Singh  <yosh@gimp.org>
      
              * gtk/gtkaccelmap.c gtk/gtkfixed.[ch] gtk/gtkkeyhash.c gtk/gtkmenu.c
              gtk/gtkobject.c gtk/gtkoldeditable.c gtk/gtkrc.c gtk/gtkspinbutton.[ch]
              gtk/gtktable.[ch] gtk/gtkthemes.c: Deprecation cleanup
      28bc5303
  24. 10 Aug, 2002 1 commit
    • Soren Sandmann's avatar
      Minor documentation fixes · 77eee887
      Soren Sandmann authored
      2002-08-10  Soren Sandmann  <sandmann@daimi.au.dk>
      
      	* docs/reference/gtk/tree_widget.sgml,
      	docs/reference/gtk/tmpl/gtkdialog.sgml,
      	docs/reference/gtk/tmpl/gtkentry.sgml,
      	docs/reference/gtk/tmpl/gtkfilesel.sgml,
      	docs/reference/gtk/tmpl/gtkfontsel.sgml,
      	docs/reference/gtk/tmpl/gtkfontseldlg.sgml,
      	docs/reference/gtk/tmpl/gtktreemodel.sgml,
      	docs/reference/gtk/tmpl/gtkwidget.sgml, gdk/x11/gdkdisplay-x11.c,
      	gtk/gtkbbox.c, gtk/gtkbox.c, gtk/gtkbutton.c, gtk/gtkcellrenderer.c,
      	gtk/gtkcellrendererpixbuf.c, gtk/gtkcellrenderertext.c,
      	gtk/gtkcheckmenuitem.c, gtk/gtkcontainer.c, gtk/gtkcurve.c,
      	gtk/gtkdialog.h, gtk/gtkentry.c, gtk/gtkfilesel.c, gtk/gtkfontsel.c,
      	gtk/gtkframe.c, gtk/gtkhandlebox.c, gtk/gtkiconfactory.c,
      	gtk/gtkimage.c, gtk/gtkinvisible.c, gtk/gtkitemfactory.c,
      	gtk/gtklabel.c, gtk/gtklayout.c, gtk/gtkmenu.c, gtk/gtkprogress.c,
      	gtk/gtkprogressbar.c, gtk/gtkscrolledwindow.c, gtk/gtksizegroup.c,
      	gtk/gtktable.c, gtk/gtktextiter.c, gtk/gtktexttag.c,
      	gtk/gtktexttag.h, gtk/gtktextview.c, gtk/gtktogglebutton.c,
      	gtk/gtktoolbar.c, gtk/gtktreemodel.c, gtk/gtktreeselection.c,
      	gtk/gtktreestore.c, gtk/gtktreeview.c, gtk/gtktreeviewcolumn.c,
      	gtk/gtkviewport.c, gtk/gtkwidget.c, gtk/gtkwidget.h,
      	gtk/gtkwindow.c:
      
      	Minor documentation fixes
      
      	(#89254, patch from Brett Nash;
      	 #85809, patch from daten@dnetc.org;
      	 #76391, patch from Ross Burton;
      	 #74559, Manuel Clos;
      	 #73569, #72005, Alexey A. Malyshev;
      	 #70061, patch from Dennis Bj"orklund;
      	 #64566, #63388, #58328, #57499, #81007, #77349, Vitaly Tishkov;
      	 #78932, Vitaly Tishkov, patch from Ross Burton;
      	 #73306)
      77eee887
  25. 02 May, 2002 1 commit
  26. 05 Mar, 2002 1 commit
    • Owen Taylor's avatar
      Don't use this same functions as idle callbacks and directly, to avoid · 3305137f
      Owen Taylor authored
      Tue Mar  5 10:29:09 2002  Owen Taylor  <otaylor@redhat.com>
      
      	* gtk/gtktreeview.c (do_presize_handler)
      	gtk/gtktreeview.c (do_validate_rows): Don't use this
      	same functions as idle callbacks and directly, to avoid
      	threading deadlocks. (#72392, Scott Guilbeaux)
      
      	* gtk/gtktable.c (gtk_table_size_request_init): Fix
      	row/column confusion from recent patch. (#73505,
      	Vitaly Tishkov.)
      3305137f
  27. 03 Mar, 2002 1 commit
  28. 13 Feb, 2002 1 commit
    • Tim Janik's avatar
      partly revert my recent expanding change to not expand the table if all · aa18bbf0
      Tim Janik authored
      Wed Feb 13 06:42:37 2002  Tim Janik  <timj@gtk.org>
      
              * gtk/gtktable.c (gtk_table_size_allocate_pass1): partly revert
              my recent expanding change to not expand the table if all children
              have not epxand behaviour. this fixes palette views which often
              use homogeneous non-expanding tables.
      aa18bbf0
  29. 12 Feb, 2002 1 commit
    • Tim Janik's avatar
      always spread out the extra space allocated for the homogeneous case, as · 1cc88c4c
      Tim Janik authored
      Tue Feb 12 02:19:49 2002  Tim Janik  <timj@gtk.org>
      
              * gtk/gtktable.c (gtk_table_size_allocate_pass1): always spread out
              the extra space allocated for the homogeneous case, as we don't
              properly deal with readjusting table allocation within it. (for  this
              purpose, a GtkAlignment can be used as table parent).
      1cc88c4c
  30. 28 Jan, 2002 1 commit
  31. 04 Nov, 2001 1 commit
    • Owen Taylor's avatar
      Add a function gdk_window_invalidate_maybe_recurse() for use in "shallow · 21457ced
      Owen Taylor authored
      Sun Nov  4 16:02:08 2001  Owen Taylor  <otaylor@redhat.com>
      
              * gdk/gdkwindow.[ch]: Add a function gdk_window_invalidate_maybe_recurse()
              for use in "shallow invalidation" of a widget. (Windows belonging
              to the widget, but not to the widget's children)
      
              * gtk/gtkprivate.h gtk/gtkwidget.c gtk/gtksizegroup.c: Add private
              flags GTK_ALLOC_NEEDED, GTK_REQUEST_NEEDED.  These flags are set
              up on ancestors up to the resize container on queue_resize. Size
              requests only actually take place if GTK_REQUEST_NEEDED, size
              allocations only take place if GTK_ALLOC_NEEDED or the size
              changed.
      
              * gtk/gtkcontainer.c gtk/gtkwidget.c: Remove
              container->resize_widgets and the RESIZE_NEEDED flag since the
              above flags are sufficient to figure out what needs to be
              resized/reallocated. Remove code manipulating
              container->resize_widget.
      
              * gtk/gtkwidget.[ch]: Add gtk_widget_set_redraw_on_alloc(); this
              allows widgets to turn off being automatically invalidated is when
              they are resized.
      
              * gtk/gtkwidget.[ch] (gtk_widget_size_allocate): Invalidation when
              a widget is resized or moved is "shallow" as described above -
              only the windows that need to be invalidated are invalidated.
      
              * gtk/gtkbox.c gtk/gtktable.c gtk/gtkalignment.c docs/Changes-2.0.txt:
              Make these widget's init functions call
              gtk_widget_set_redraw_on_allocate(widget,FALSE).
      
              * gtk/gtkwindow.c (gtk_window_configure_event): Call
              _gtk_container_queue_resize(), since we don't want
              redrawing. (Probably could be done for other
              calls to gtk_widget_queue_resize() in gtkwindow.c,
              but this is the most important one.)
      
              * gtk/gtkwindow.c (gtk_window_move_resize): Don't call
              gtk_widget_queue_draw() - size_allocate() handles
              that as appropriate.
      
              * gtk/gtkframe.c (gtk_frame_size_allocate): Invalidate instead
              of queue_clear() to avoid invalidating children.
      21457ced
  32. 24 Sep, 2001 1 commit
    • Owen Taylor's avatar
      Add a compat macro that got lost. · 540f15dc
      Owen Taylor authored
      Mon Sep 24 12:48:25 2001  Owen Taylor  <otaylor@redhat.com>
      
              * gtk/gtknotebook.h: Add a compat macro that got lost.
      
              * gtk/gtktreestore.c: Doc fixes.
      
              * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix reference
              leak for windows that receive events after being destroyed.
              (#60863, Joshua N. Pritikin)
      
              * gtk/gtktable.c (gtk_table_remove): Use gtk_widget_queue_resize
              rather than gtk_container_queue_resize().
      
              * gtk/{gtkcontainer.c,gtkwidget.c,gtkwindow.c}: _gtk prefix
              gtk_container_queue_resize, gtk_container_queue_resize_widgets,
              gtk_container_child_composite_name. (#60217.)
      540f15dc
  33. 08 Sep, 2001 1 commit
    • Havoc Pennington's avatar
      put GtkPacker back in here so it won't be in gtk-unused.txt, but don't put · 372853b1
      Havoc Pennington authored
      2001-09-08  Havoc Pennington  <hp@pobox.com>
      
      	* gtk/gtk-sections.txt: put GtkPacker back in here so it won't be
      	in gtk-unused.txt, but don't put it back in gtk-docs.sgml.
      
      	Tons of other additions from gtk-unused.txt, but mostly skipping
      	all the tree stuff for now.
      
      2001-09-08  Havoc Pennington  <hp@pobox.com>
      
      	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_add_attribute):
      	docs fixes
      
      	* gtk/gtktable.c (gtk_table_get_col_spacing): docs fixes
      
      	* gtk/gtkspinbutton.c (gtk_spin_button_get_increments): docs fixes
      
      	* gtk/gtksocket.c (gtk_socket_steal): docs fixes
      
      	* gtk/gtkscrolledwindow.h: docs fixes
      
      	* gtk/gtkimage.c (gtk_image_new): docs fixes
      372853b1
  34. 26 Aug, 2001 1 commit
  35. 19 Jul, 2001 1 commit
    • Owen Taylor's avatar
      Enforce the widget/child realization/mapping invariants. · aa49527f
      Owen Taylor authored
      Sat Jul  7 02:50:14 2001  Owen Taylor  <otaylor@redhat.com>
      
      	* gtk/gtkwidget.c (gtk_widget_set_parent): Enforce
      	the widget/child realization/mapping invariants.
      
      	* gtk/gtkwidget.[ch] gtk/gtkprivate.h: Add functions
      	gtk_widget_[get/set]_child_visible() to control
      	whether visible children of a mapped window are
      	mapped.
      
      	* docs/widget_system.txt: Updated for changes in
      	container contract, and addition of GTK_CHILD_VISIBLE.
      
      	* gtk/gtkcontainer.c: Add generic map()/unmap()
      	functions that work for almost all containers.
      
      	* gtk/gtknotebook.c gtk/gtkpacker.c: Use
      	gtk_widget_set_child_visible() where necessary.
      
      	* gtk/*.c: Remove excess map(), unmap(), and
      	realization/mapping invariant enforcing code
      	from many containers.
      aa49527f
  36. 18 Jul, 2001 1 commit
    • Owen Taylor's avatar
      Patch from Matthias Clasen to remove remove all instances of · 4e2b60ac
      Owen Taylor authored
      Wed Jul 18 19:28:46 2001  Owen Taylor  <otaylor@redhat.com>
      
      	* gtk/*.c: Patch from Matthias Clasen to remove remove
      	all instances of g_return_if_fail (foo != NULL); that are
      	immediately before a g_return_if_fail (GTK_IS_FOO (foo));
      	since the second check catches the NULL anyways.
      4e2b60ac
  37. 24 Jun, 2001 1 commit
    • Owen Taylor's avatar
      Fix stupid error introduced last night that was making things decidedly · cc223eef
      Owen Taylor authored
      Sun Jun 24 11:29:35 2001  Owen Taylor  <otaylor@redhat.com>
      
      	* gdk/x11/gdkimage-x11.c (gdk_image_new): Fix stupid error
      	introduced last night that was making things decidedly not work.
      
      	* gtk/*.[ch]: Patch from Kristian Rietveld adding 80 getters
      	so that we have getter/setter pairing everywhere it makes
      	sense. (#55767)
      
      	* gtk/gtkradiobutton.[ch] gtk/gtktoolbar.c tests/testgtk.:
      	Rename gtk_radio_button_group to gtk_radio_button_get_group, add a
      	deprecated compat macro. (#55516)
      
      	* gtk/gtklabel.[ch]: Add functions
      	gtk_label_set/get_use_underline(), gtk_label_set/get_use_markup(),
      	gtk_label_set_label(), which mirror the property API for GtkLabel.
      	Make gtk_label_get_attributes() only reflect the attributes
      	set by gtk_label_set_attributes.
      
      	* gtk/gtknotebook.c (gtk_notebook_set_current_page) gtk/gtkcompat.h: Rename
      	from gtk_notebook_set_page().
      cc223eef
  38. 19 Jun, 2001 1 commit
    • Tim Janik's avatar
      fix PROP_EVENTS. · 5ebd1d02
      Tim Janik authored
      Mon Jun 18 02:00:49 2001  Tim Janik  <timj@gtk.org>
      
              * gtk/gtkwidget.c (gtk_widget_get_property): fix PROP_EVENTS.
      
              * gtk/Makefile.am:
              * gtk/gtk.h: disabled GtkPacker compilation.
      
              * gtk/gtkarg.[hc], gtk/gtkargcollector.c: got rid of these.
      
              * gtk/gtknotebook.c:
              * gtk/gtktable.c:
              * gtk/gtkbox.c: ported this over to child properties.
      
              * gtk/gtksettings.c: fetch class properties via
              g_object_class_list_properties().
      
              * gtk/gtkcontainer.[hc]: implemented child properties, got rid of the
              child arg interface. use gobjectnotifyqueue.c for child property
              notification.
      
              * gtk/gtkwidget.[hc]: provide necessary means for container child
              properties, i.e. ::child_notify signal,
              gtk_widget_freeze_child_notify(),
              gtk_widget_child_notify(),
              gtk_widget_thaw_child_notify().
      
              * tests/testgtk.c: removed inferior property handling code, for
              property editing, a generic module should be used, and GLE
              coincidentally fullfills that purpose.
      
              * docs/reference/Makefile.am: disabled gtk docs building, gtk-doc
              needs to be adapted to g_object_class_list_properties() before this
              builds again.
      5ebd1d02
  39. 08 Jun, 2001 1 commit
    • Jonathan Blandford's avatar
      warn if row/cols are out of range. Fix bug #55921 · 72ef055b
      Jonathan Blandford authored
      Fri Jun  8 12:38:49 2001  Jonathan Blandford  <jrb@redhat.com>
      
      	* gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of
      	range.  Fix bug #55921
      
      	* gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug
      	(#55920).
      
      Fri Jun  8 12:38:49 2001  Jonathan Blandford  <jrb@redhat.com>
      
      	* gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of
      	range.  Fix bug #55921
      
      	* gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug
      	(#55920).
      72ef055b
  40. 30 Mar, 2001 1 commit
    • Alexander Larsson's avatar
      Remove leaks. · aa209a95
      Alexander Larsson authored
      2001-03-30  Alexander Larsson  <alexl@redhat.com>
      
      	* gtk/gtkbutton.c (gtk_button_get_property):
      	* gtk/gtklabel.c:
      	Remove leaks.
      
      	* gtk/gtkcontainer.c:
      	* gtk/gtkhscale.c:
      	* gtk/gtkhscrollbar.c:
      	* gtk/gtklayout.c:
      	* gtk/gtkmisc.c:
      	* gtk/gtkprogress.c:
      	* gtk/gtkprogressbar.c:
      	* gtk/gtkrange.c:
      	* gtk/gtktable.c:
      	* gtk/gtkviewport.c:
      	* gtk/gtkvscale.c:
      	* gtk/gtkvscrollbar.c:
      	* gtk/gtkwidget.c:
      	Property patches, based on patches from John Margaglione and Lee Mallabone.
      aa209a95