Commit Graph

172 Commits

Author SHA1 Message Date
Matthew Allum
9b1ae0949e 2006-08-07 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-video-texture.c: (lay_pipeline):
        Set quality of service prop on fakesink to TRUE.
2006-08-07 22:04:29 +00:00
Matthew Allum
410eabf9d5 2006-08-07 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-actor.c: (clutter_actor_paint):
        Remove relic from old stage behaviour - dont unref
        it during a clip.
2006-08-07 21:27:11 +00:00
Emmanuele Bassi
3146bdbf16 2006-07-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-feature.c: No need to call clutter_feature_init()
	each time: it's private and should never be seen from the outside;
	add a warning, just in case something screws up and calls it more
	than once.
2006-07-27 17:10:33 +00:00
Emmanuele Bassi
ad29f37780 2006-07-27 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-private.h: Move clutter_feature_init()
	declaration here: you shouldn't even need to initialise
	features yourself.

	* clutter/clutter-feature.c: call clutter_feature_init()
	each time you try to access the feature list; add a static
	lock around the feature flags container; add api documentation.

	* clutter/clutter-feature.h: Add a type for the feature flags
	to make bindings happy.
2006-07-27 16:09:25 +00:00
Matthew Allum
ecccec75cb 2006-07-24 Matthew Allum <mallum@openedhand.com>
* clutter/Makefile.am:
        * clutter/clutter-feature.c:
        * clutter/clutter-feature.h:

        Add new funcs for checking for available runtime GL
        extensions.

        * clutter/clutter-clone-texture.c:
        * clutter/clutter-texture.c:

        Add support for non power of two textures
       if GL_TEXTURE_RECTANGLE_ARB extension available ( at runtime ).
       Should lower texture memory needs a little.
2006-07-24 21:15:19 +00:00
Emmanuele Bassi
55f9adeb41 2006-07-17 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-stage.c (clutter_stage_get_default): Fix
	api documentation.
2006-07-17 09:10:08 +00:00
Emmanuele Bassi
939ce2877c 2006-07-15 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-main.c:
	
	(clutter_main): Destroy the main stage, instead of unreffing it.

	(clutter_init): Ref and sink the main stage, as it is a top
	level actor.

	* clutter/clutter-stage.c (clutter_stage_unrealize): Access
	the Window private member directly, instead of calling the
	get_xwindow method.

	* examples/test.c (main): Quit on button press.
2006-07-15 22:47:37 +00:00
Emmanuele Bassi
ce5c1150f2 2006-07-09 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-event.h: Change the name of the
	ClutterEvent union members to something a little shorter.
2006-07-10 10:52:04 +00:00
Emmanuele Bassi
3ecdb62d7b 2006-07-06 Emmanuele Bassi <ebassi@openedhand.com>
* configure.ac: Mark this as 0.1.1, and change the version info
	of the library.

	* clutter/clutter-actor.c:
	* clutter/clutter-group.c: Fix documentation.
2006-07-06 18:55:46 +00:00
Emmanuele Bassi
5fa9fc161b 2006-07-06 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-actor.h:
	* clutter/clutter-actor.c:
	
	(clutter_actor_class_init), (clutter_actor_set_property),
	(clutter_actor_get_property): Add the "clip" and "has-clip"
	properties.

	(clutter_actor_set_clip), (clutter_actor_remove_clip): Emit
	the notification for the changed properties.

	(clutter_actor_has_clip): Simple accessor to the "has-clip"
	property.
2006-07-06 18:12:19 +00:00
Emmanuele Bassi
212c4a0ee8 2006-07-06 Emmanuele Bassi <ebassi@openedhand.com>
Big rework of the actor management semantics: now ClutterActor
	objects behave like GtkObjects - that is they have an initial
	"floating" reference that gets "sunk" when they are added to
	a ClutterGroup.  This makes a group responsible of de-allocating
	each actor inside it, so you just have to destroy the group to
	get every child actor destroyed.  Also, now you can do:

	  clutter_group_add (group, clutter_video_texture_new ());
	
	without having to care about reference counting and explicit
	unreffing.

	* clutter/clutter-private.h: Add private flags setter and
	getter macros.

	* clutter/clutter-actor.h:
	* clutter/clutter-actor.c: Clean up; inherit from GInitiallyUnowned;
	add a "visible" property; add the "destroy", "show" and "hide"
	signals to ClutterActorClass.

	(clutter_actor_show), (clutter_actor_hide): Refactor a bit; emit
	the "show" and "hide" signals.

	(clutter_actor_set_property), (clutter_actor_get_property),
	(clutter_actor_class_init): Implement the "visible" property; add
	signals.

	(clutter_actor_finalize): Do not leak the actor's name, if it is
	set.
	
	(clutter_actor_dispose): Emit the "destroy" signal here.

	(clutter_actor_init): Sink the initial floating flag if needed.

	(clutter_actor_destroy): Add a function to explicitely destroy
	a ClutterActor.

	(clutter_actor_set_parent), (clutter_actor_get_parent),
	(clutter_actor_unparent): Make set_parent require a valid parent;
	add unparent; check on get_parent; ref_sink the actor when
	setting its parent and unref it when unsetting it.  Probably we'll
	need a function that does reparenting as unparent+set_parent in
	a single shot.

	* clutter/clutter-group.h:
	* clutter/clutter-group.c (clutter_group_dispose),
	(clutter_group_finalize), (clutter_group_add),
	(clutter_group_remove): Make the group destroy its children when
	disposing it; clean up, and use the newly-available
	clutter_actor_unparent().

	* clutter/clutter-stage.h:
	* clutter/clutter-stage.c (clutter_stage_init): ClutterStage is
	a top-level actor; clean up.

	* clutter/clutter-video-texture.h:
	* clutter/clutter-video-texture.c: Clean up.

	* examples/super-oh.c:
	* examples/test.c:
	* examples/video-player.c:
	* examples/test-text.c:
	* examples/video-cube.c: Remove the g_object_unref() call, as the
	ClutterStage object is destroyed on clutter_main_quit().
2006-07-06 17:52:57 +00:00
Iain Holmes
8692008027 Fix typo 2006-06-23 18:18:56 +00:00
Matthew Allum
fb5f7475d7 2006-06-23 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-video-texture.c: (clutter_video_texture_new):
        Small fix for video playback on Big Endian. See #99
2006-06-23 15:26:43 +00:00
Iain Holmes
5a01d0ab1c Shuffle some layout so that gapi2-parser can understand everything 2006-06-23 15:13:11 +00:00
Emmanuele Bassi
c38bbd2708 2006-06-23 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-group.c
	(clutter_group_get_children): Mention that you must free
	the returned list otherwise you'll leak stuff all around.
2006-06-23 10:32:42 +00:00
Iain Holmes
9b0bd1320e 80% coverage 2006-06-22 14:36:05 +00:00
Iain Holmes
96ed832b09 Add more docs...80% coverage 2006-06-22 14:31:19 +00:00
Iain Holmes
9e1308d9a4 Forgot this bit 2006-06-22 14:16:41 +00:00
Iain Holmes
bf695c4dab Add docs for clutter-media 2006-06-22 14:14:58 +00:00
Iain Holmes
3d95e12687 Fix typos...74% 2006-06-22 13:56:04 +00:00
Ross Burton
e44ba1b7b4 Fix typo 2006-06-22 13:50:39 +00:00
Iain Holmes
f13810a34a Docs 2006-06-22 13:48:09 +00:00
Iain Holmes
23cf8a892b More docs 2006-06-22 13:44:47 +00:00
Iain Holmes
ae1eccdc6d Fix typos and move *_get_type t private sections
--his line, and those below, will be ignored--

M    clutter/clutter-actor.c
M    ChangeLog
M    doc/reference/clutter-sections.txt
M    doc/reference/ChangeLog
M    doc/reference/tmpl/clutter-enum-types.sgml
M    doc/reference/tmpl/clutter-color.sgml
M    doc/reference/tmpl/clutter-event.sgml
M    doc/reference/tmpl/clutter-group.sgml
2006-06-22 13:05:45 +00:00
Emmanuele Bassi
33d0c989ca 2006-06-22 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-timeline.h:
	* clutter/clutter-timeline.c: Add a "started" and a "paused"
	signals; add more sanity checks on the public functions.
	
	(clutter_timeline_get_loop): Add a getter function for the
	loop property.

	* clutter/clutter-marshal.list: Add marshallers.

	* clutter/clutter-timeline.h:
	* clutter/clutter-actor.h: Add padding for future expansion
	without breaking ABI.
2006-06-22 12:05:51 +00:00
Iain Holmes
a695e2f06c More docustuff 2006-06-22 09:25:01 +00:00
Ross Burton
1b22637650 More gtk-doc fixes 2006-06-22 09:24:15 +00:00
Ross Burton
110d8b9f2d * clutter/clutter-group.c:
Fix gtk-doc problems.
2006-06-22 09:19:32 +00:00
Ross Burton
58f2fff6d7 2006-06-22 Ross Burton <ross@openedhand.com>
* clutter/clutter-label.c:
	* clutter/clutter-video-texture.c:
	* clutter/clutter-texture.c:
	* clutter/clutter-timeline.c:
	Fix gtk-doc problems.
2006-06-22 09:14:35 +00:00
Iain Holmes
ad77326868 More documentation 2006-06-22 09:12:40 +00:00
Matthew Allum
2ccbe3001f 2006-06-22 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-main.h:
        Remove bogus xvisual call.
2006-06-22 08:40:37 +00:00
Iain Holmes
4dd3fa6400 Some more docs 2006-06-21 23:19:59 +00:00
Matthew Allum
38980ad67f 2006-06-22 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-actor.c:
        * clutter/clutter-actor.h:
        Remove mirroring related calls ( unimplemented )
        * gtk/gtk-clutter-test.c: 0 -> NULL
2006-06-21 23:06:55 +00:00
Iain Holmes
f4eee9ad3a Some more docs 2006-06-21 23:02:20 +00:00
Matthew Allum
c39b868aeb 2006-06-22 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-actor.c:
        * clutter/clutter-clone-texture.c:
        * clutter/clutter-color.c:
        * clutter/clutter-event.c:
        * clutter/clutter-group.c:
        * clutter/clutter-label.c:
        * clutter/clutter-main.c:
        * clutter/clutter-media.c:
        * clutter/clutter-rectangle.c:
        * clutter/clutter-stage.c:
        * clutter/clutter-texture.c:
        * clutter/clutter-timeline.c:
        * clutter/clutter-util.c:
        * clutter/clutter-video-texture.c:
        * configure.ac:
        Documentation updates - add section headers.
2006-06-21 22:34:25 +00:00
Emmanuele Bassi
8cb8cfd5f0 2006-06-21 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/Makefile.am: Re-fix distcheck after last commit.
2006-06-21 17:21:19 +00:00
Matthew Allum
d61ee2240b 2006-06-21 Matthew Allum <mallum@openedhand.com>
* clutter/Makefile.am:
        Make sure clutter.h included.
        * clutter/clutter-stage.c: (clutter_stage_realize),
        (clutter_stage_get_actor_at_pos):
        Select for motion events on X window.
        Return highest rather than lowest found actor for actor_at_pos.
        * examples/Makefile.am:
        Remove test-text, remane test video.
        * examples/README:
        Add info about the included examples.
        * examples/test-video.c:
        * examples/video-player.c:
        Redo test-video a little nicer and rename.
        * examples/video-cube.c:
        Fix so it at least 'works' again.
        * examples/test.c:
        Clean up a little.
2006-06-21 16:29:28 +00:00
Emmanuele Bassi
c8d963f80d 2006-06-21 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/Makefile.am:
	* bindings/python/Makefile.am:
	* Makefile.am: Fix distcheck
2006-06-21 15:54:46 +00:00
Ross Burton
f6413c66e9 2006-06-21 Ross Burton <ross@openedhand.com>
* clutter/Makefile.am:
	* examples/Makefile.am:
	Fix dist.
2006-06-21 14:40:36 +00:00
Matthew Allum
35ee56c50d 2006-06-20 Matthew Allum <mallum@openedhand.com>
* TODO:
        Update.
        * clutter/clutter-group.c:
        Attempt better group sizing code.
        * clutter/clutter-label.c:
        Minor tweaks.
        * clutter/clutter-texture.c:
        More debug info, make sure texture is realised for base_size()
        * clutter/clutter-video-texture.c:
        Seeking fixes
        * examples/test.c: (main):
        Populate with more randomness.
2006-06-20 20:29:45 +00:00
Matthew Allum
13ce0e3709 2006-06-15 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-stage.c:
        * clutter/clutter-stage.h:
        Add clutter_stage_set_xwindow_foreign() call
        * clutter/clutter-util.c:
        * clutter/clutter-util.h:
        Add some X error traps
        * examples/super-oh.c:
        Toy with us of new clutter_stage_set_xwindow_foreign() for
        optional screensaver functionality.
2006-06-15 22:04:19 +00:00
Matthew Allum
1127c5605f 2006-06-13 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-video-texture.c:
        Add missing license.
2006-06-13 16:18:24 +00:00
Matthew Allum
df92202c5f 2006-06-13 Matthew Allum <mallum@openedhand.com>
* clutter/Makefile.am:
        * clutter/clutter-actor.c:
        * clutter/clutter-actor.h:
        * clutter/clutter-clone-texture.c:
        * clutter/clutter-clone-texture.h:
        * clutter/clutter-element.c:
        * clutter/clutter-element.h:
        * clutter/clutter-group.c:
        * clutter/clutter-group.h:
        * clutter/clutter-label.c:
        * clutter/clutter-label.h:
        * clutter/clutter-main.c:
        * clutter/clutter-main.h:
        * clutter/clutter-rectangle.c:
        * clutter/clutter-rectangle.h:
        * clutter/clutter-stage.c:
        * clutter/clutter-stage.h:
        * clutter/clutter-texture.c:
        * clutter/clutter-texture.h:
        * clutter/clutter-video-texture.c:
        * clutter/clutter-video-texture.h:
        * clutter/clutter.h:
        * examples/super-oh.c:
        * examples/test-text.c:
        * examples/test-video.c:
        * examples/test.c:
        * examples/video-cube.c:
        * gtk/gtk-clutter-test.c:
        * gtk/gtk-clutter.c:
        * gtk/gtk-clutter.h:
        Element to Actor Renaming.
2006-06-13 13:17:45 +00:00
Matthew Allum
9afe83e695 2006-06-12 Matthew Allum <mallum@openedhand.com>
* clutter/Makefile.am:
        * clutter/clutter-media.c:
        * clutter/clutter-media.h:
        * clutter/clutter-video-texture.c:
        * clutter/clutter-video-texture.h:
        * clutter/clutter.h:
        * examples/test-video.c: (main):
        * examples/video-cube.c: (main):
        Add new 'media' interface.
        Drop Totem based video playback code replace with newly
        rewritten supper Jorn based code. Clutter is now fully LGPL.

        * clutter/clutter-texture.c: (tile_dimension):
        Remove uneeded overlap code.
2006-06-12 20:38:57 +00:00
Iain Holmes
968f8c1054 2006-06-08 Iain Holmes <iain@openedhand.com>
* clutter/clutter-texture.c:
        Opps, undo change I didn't mean to commit
2006-06-08 22:36:17 +00:00
Iain Holmes
9e9240b2a5 2006-06-08 Iain Holmes <iain@openedhand.com>
* configure.ac:
        Add gdk-pixbuf-xlib cflags/libs to clutter libs
        Build the gtk-clutter.pc file.

        * clutter.pc.in:
        Add the gdk-pixbuf-xlib depends.

        * gtk/gtk-clutter.pc.in:
        pkg-config stuff for gtk-clutter

        * gtk/Makefile.am:
        Install gtk-clutter.pc
2006-06-08 22:19:32 +00:00
Matthew Allum
9c572ff45a 2006-06-08 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-main.c:
        * clutter/clutter-private.h:
        * clutter/clutter-stage.c:
        Rework and fix offscreen rendering, also rejig GLX
        context handling, moving mostly into stage.
        Require at least OpenGL 1.2 ( CLAMP_TO_EDGE )

        * clutter/clutter-texture.c:
        Explicity set props on _init() as to avoid nasty can_create
        bug failing miserably in certain situations.
        Switch to CLAMP_TO_EDGE for textures to avoid tile seams.
        Add some more GL error checks.

        * clutter/clutter-label.c:
        Extra debug info

        * configure.ac:
        Require gdk-pixbuf-xlib-2.0
2006-06-08 21:28:05 +00:00
Matthew Allum
f00e84606c 2006-06-06 Matthew Allum <mallum@openedhand.com>
* configure.ac:
        Use pkg-config to check for X. Really Check for GL libs.
        Make gtk binding optional. Cleanup a little.

        * Makefile.am:
        * gtk/Makefile.am:
        Make gtk binding optional

        * clutter/clutter-element.c:
        Cleanup a little, notify on size change.

        * clutter/clutter-texture.c:
        Lots of cleanups. Add waste prop. Add filter quality prop.

        * clutter/clutter-clone-texture.c:
        Make object construction simpler to work better with bindings.

        * clutter/clutter-stage.c:
        * clutter/clutter-timeline.c:
        Minor reformating, cleanups.

        * examples/test-text.c: (main):
        Random experimentation
2006-06-06 20:40:40 +00:00
Matthew Allum
f040e5b0da 2006-06-05 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-group.c: (clutter_group_remove):
        Fix parent check.
2006-06-05 21:49:25 +00:00
Matthew Allum
7806e409fb 2006-06-05 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-event.h:
        Remove send_event field. Clutter shouldn't need it.

        * clutter/clutter-main.c: (clutter_dispatch_x_event):
        Dont malloc a new clutter event for each xevent.

        * clutter/clutter-stage.h:
        * clutter/clutter-stage.c: (clutter_stage_class_init),
        (clutter_stage_get_default):
        Dont ref stage from clutter_stage_get_default.

        * examples/super-oh.c: (main):
        Remove some now uneeded debug g_prints
2006-06-05 21:44:13 +00:00
Emmanuele Bassi
f6fe9e7412 2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
	* clutter-color.c: Reimplement ClutterColor as a boxed type;
	add convenience API for color handling, like: add, subtract,
	shade, HSL color-space conversion, packing and unpacking.

	* clutter-private.h: Update ClutterMainContext, and export the
	main context pointer here.

	* clutter-rectangle.h:
	* clutter-rectangle.c: Update the color-related code; make
	clutter_rectangle_new() and empty constructor and provide
	clutter_rectangle_new_with_color(); provide color setter
	and getter API.

	* clutter-label.h:
	* clutter-label.c: Rename the "font" property to "font-name";
	update the color-related code to the new ClutterColor object;
	rename clutter_label_new() to clutter_label_new_with_text(),
	and add setters and getters for the properties.

	* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
	generators.

	* clutter-stage.h:
	* clutter-stage.c: Rework the API: provide a default constructor
	for a singleton object, named clutter_stage_get_default(), which
	supercedes the clutter_stage() function in clutter-main; provide
	new events: button-press-event, button-release-event,
	key-press-event and key-release-event; update the color-related
	code;

	(clutter_stage_snapshot): Allow negative width and height when
	taking a snapshot (meaning: use full width/height).

	(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().

	* clutter-element.c (clutter_element_paint): Clean up the
	stage and color related code.

	* clutter-event.h:
	* clutter-event.c: Add generic ClutterAnyEvent type; add
	clutter_event_new(), clutter_event_copy() and clutter_event_free();
	make ClutterEvent a boxed type.

	* clutter-main.h:
	* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
	for cleanly quitting from clutter_main(); add multiple mainloops
	support; allocate the ClutterCntx instead of adding it to the
	stack; re-work the ClutterEvent dispatching.

	* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
	a reference on the element when added to a ClutterGroup.

	* examples/rects.py
	* examples/test.c:
	* examples/test-text.c:
	* examples/video-cube.c:
	* examples/super-oh.c:
	* examples/test-video.c: Update.
2006-06-05 13:38:31 +00:00
Matthew Allum
1d16ef11ca 2006-06-04 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-element.c:
        * clutter/clutter-group.c:
        * clutter/clutter-group.h:
        Work more on depth ( Z ) setting with sorting.

        * clutter/clutter-main.c: (clutter_redraw):
        Experiment with glXWaitVideoSyncSGI. Currently disabled.
2006-06-04 22:09:18 +00:00
Matthew Allum
ba09979db0 2006-06-02 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-element.h:
        Add missing _depth() declarations

        * clutter/clutter-main.c:
        * clutter/clutter-main.h:
        * clutter/clutter-private.h:
        * clutter/clutter-stage.c:
        * clutter/clutter-stage.h:
        Rejig GL setup as for stage to support an offscreen property.
        Offscreen support is however a little borked.
2006-06-02 20:24:55 +00:00
Matthew Allum
6c471cb7e1 2006-06-01 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-element.c:
        Fix a snafu in clutter_element_raise ()

        * clutter/clutter-timeline.c:
        * clutter/clutter-timeline.h:
        Add new clutter_timeline_is_playing() method
2006-06-01 21:37:28 +00:00
Matthew Allum
70ed2f4233 2006-05-29 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-color.c: (clutter_color_set):
        Fix bit shifts in clutter color setters.
2006-05-29 20:01:49 +00:00
Matthew Allum
342ea125f1 Merge gobject-branch into trunk 2006-05-29 08:59:36 +00:00
Matthew Allum
c936f265b0 more select hacking 2005-05-27 14:02:39 +00:00
Matthew Allum
8f30e4e0c1 much select hacking 2005-05-23 21:21:50 +00:00
Matthew Allum
956008e6c3 playback fixes 2005-05-17 10:12:10 +00:00
Matthew Allum
55fdb9bc79 much 2005-05-16 22:38:57 +00:00
Matthew Allum
9c9dad903c Add initial animator zoom code 2005-05-15 23:16:19 +00:00
Matthew Allum
3838ffe065 Much, see ChangeLog 2005-05-14 10:19:39 +00:00
Matthew Allum
24cefa8d2a gl crash fixes 2005-05-11 12:52:01 +00:00
Matthew Allum
f085407d41 Video widget updates 2005-05-06 17:41:15 +00:00
Matthew Allum
246e6bdd5d hack buttons some more 2005-04-29 16:44:17 +00:00
Matthew Allum
64355c0e48 video improvements + other tweaks 2005-04-27 22:17:45 +00:00
Matthew Allum
26decbdb97 Add broken gst video widget 2005-04-26 08:56:53 +00:00
Matthew Allum
298f878086 Lots, see ChangeLog 2005-04-22 18:03:55 +00:00
Matthew Allum
3b342b81b7 autotool rejig 2005-04-13 19:49:56 +00:00
Matthew Allum
d95ce956ee another random rejig commit 2005-04-13 17:39:40 +00:00
Matthew Allum
214935cba7 another random commit 2005-04-13 17:36:43 +00:00
Matthew Allum
69e830eea4 random commit to help rejig stuff around 2005-04-13 17:36:17 +00:00