eog r4134 - in branches/gnome-2-20: . bindings/python src

[lucasr svn gnome org]

Author: lucasr
Date: 2007-10-15 21:53:04 +0100 (Mon, 15 Oct 2007)
New Revision: 4134
ViewCVS link: http://svn.gnome.org/viewcvs/eog?rev=4134&view=rev

Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/bindings/python/eog.defs
   branches/gnome-2-20/src/eog-image-private.h
   branches/gnome-2-20/src/eog-image.c
   branches/gnome-2-20/src/eog-image.h
   branches/gnome-2-20/src/eog-list-store.c
   branches/gnome-2-20/src/eog-list-store.h
Log:
2007-10-15  Lucas Rocha  <lucasr gnome org>

	Because of a bug in gnome-vfs file monitoring, we need to avoid
	an image that is being saved to be removed and re-added by the monitor
	handler. We do this by setting the image's status to "saving" and, in
	case the image is being monitored, the status is only restored after the
	"fake" image deletion is notified by gnome-vfs. Fixes bug #475645.

	* bindings/python/eog.defs: remove eog_image_add_image_from_uri() from
	public API.
	* src/eog-image-private.h: added "prev_status" and "is_monitored"
	private attributes.
	* src/eog-image.[ch]: 
	(eog_image_init): initialize new attributes.
	(eog_image_save_by_info): store previous status and restore only in
	case the image is not monitored.
	(eog_image_save_as_by_info): store previous status and restore only in
	case the image is not monitored.
	(eog_image_get_status),	(eog_image_restore_status), 
	(eog_image_set_is_monitored): new utility methods in public API.
	* src/eog-list-store.[ch]: 
	(eog_list_store_append_image_from_uri): turned into a private method
	and we already have eog_list_store_add_image().
	(vfs_monitor_dir_cb): only remove image if it's not being saved.
	(directory_visit_cb), (eog_list_store_add_uris): set images as
	monitored accordingly.