2008-02-14  John Stowers  <john.stowers@gmail.com>

	* scripts/maintainer.py: Remove duplicate function
	* scripts/release.sh: Pass inferior arguments

2008-02-14  John Stowers  <john.stowers@gmail.com>

	* scripts/maintainer.py: Split versoin into majmin version for download url
	* scripts/release-template.txt: Fix download URL in release template

2008-02-14  John Stowers  <john.stowers@gmail.com>

	* NEWS:
	* scripts/maintainer.py:
	* scripts/release-template.txt:
	* scripts/release.sh: Add maintainer.py to help me do releases more
	frequently

2008-02-14  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/NetworkModule/XMLRPCUtils.py: Add allow_none to Server
	objects. This should fix the two way network sync bugs people were seeing

2008-02-14  John Stowers  <john.stowers@gmail.com>

	* test/python-tests/TestCoreSettings.py: Fix settings test
	s/gui_expanded_columns/gui_expanded_rows

2008-02-13  John Stowers  <john.stowers@gmail.com>

	* conduit/*:
	* data/*:
	* tools/*: Add more svn:ignores

2008-02-13  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py: don't import urllib2,
	we don't need it anymore

2008-02-13  John Stowers  <john.stowers@gmail.com>

	* conduit/Settings.py:
	* conduit/gtkui/Tree.py:
	* conduit/gtkui/UI.py: Save and restore expanded dataprovider treeview
	categories. Disabled by default until it gets more testing.

2008-02-12  John Stowers  <john.stowers@gmail.com>

	* conduit/Settings.py:
	* conduit/gtkui/UI.py: Make the rgba colormap a gconf option until I can
	work out why it corrupts screen rendering on my system
	
	* conduit/modules/FileModule/FileConfiguration.py: Finally save and restore
	the selected folder correctly. Fixes bug #510523

2008-02-12  John Stowers  <john.stowers@gmail.com>

	* conduit/gtkui/UI.py: Disable rgba colormap, it breaks the gtkmozembed
	browser in weird ways
	
	* conduit/modules/FacebookModule/FacebookModule.py: Update to new 
	is_configured() API

2008-02-11  John Stowers  <john.stowers@gmail.com>

	* conduit/gtkui/UI.py: Added RGBA support for conduit. Fixes #515648 (Jon Bolt)

2008-02-10  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py: Fix test. Import urllib2

	* test/python-tests/TestCoreSyncLogic.py:
	* test/python-tests/TestCoreSyncTestDataProviders.py:
	* test/python-tests/TestSyncImageSync.py:
	* test/python-tests/TestSyncTomboyFolder.py:
	* test/python-tests/TestSyncTomboyiPod.py: Fix conflict tests. 
	Call set_two_way_sync_policy() after prepare()

2008-02-10  John Stowers  <john.stowers@gmail.com>

	* data/conduit.glade: Add conflict_* and deleted_* radio items to a group
	so that only one can be active at a time.
	
	* conduit/Conduit.py:
	* conduit/Conflict.py:
	* conduit/gtkui/ConflictResolver.py:
	* conduit/modules/TestModule.py:
	* data/icons/hicolor/16x16/actions/Makefile.am: Add an icon for 
	conflict-skip and swap the function of conflict-ask. The states for conflict
	resolution (by the user) are now ask->skip->put/delete->skip

2008-02-10  John Stowers  <john.stowers@gmail.com>

	* conduit/Conduit.py:
	* conduit/gtkui/UI.py: Show the conflict resolution icons in the
	preferences dialog to help the user become familiar with them.

2008-02-10  John Stowers  <john.stowers@gmail.com>

	* conduit/gtkui/UI.py:
	* data/conduit.glade: Add a 'developer' submenu to the help menu if the 
	user is running a development version. This submenu contains items 
	which link to the newly improved developer documentation. The linked 
	pages are displayed in conduit's built in web browser.

2008-02-09  John Stowers  <john.stowers@gmail.com>

	* conduit/Conduit.py:
	* conduit/Settings.py:
	* conduit/SyncSet.py:
	* conduit/Synchronization.py:
	* conduit/gtkui/Canvas.py:
	* conduit/gtkui/UI.py:
	* conduit/hildonui/UI.py:
	* data/conduit.glade:
	* test/python-tests/common.py: Conflict settings are now per Conduit,
	with a configurable default in the preferences window. Fixes bug #510094

2008-02-09  John Stowers  <john.stowers@gmail.com>

	* conduit/hildonui/Canvas.py:
	* data/conduit.glade: Change Dataprovider to Data Provider in all UI
	strings. Patch from Ted Percival

2008-02-08  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/GoogleModule/youtube-config.glade: Switch position
	of the ok and cancel button.

2008-02-08  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py: Youtube changed
	apparently changed for data format, use a new trick to get the flv
	files. Fixes #514589.

2008-02-08  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/FlickrModule/flickrapi/__init__.py:
	* conduit/modules/FlickrModule/flickrapi/reportinghttp.py:
	* conduit/modules/FlickrModule/flickrapi/multi-username.patch: Remove
	the code that changes the configuration of our logger.  Fixes #515270.

2008-02-08  John Stowers  <john.stowers@gmail.com>

	* doc/ExampleModule.py: Make the example dataprovider twoway and 
	more exemplary and remove the live.gnome.org xmlrpc business because
	thats broken with the new moinmoin version anyway.

2008-02-07  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/data/conduit.glade: Make the Conflict	Preferences a bit 
	better.	Fixes bug #512540

2008-02-07  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py: Fix PicasaTwoWay
	set_configuration bug introduced in last commit

2008-02-07  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py:
	* test/python-tests/TestDataProviderGoogle.py: Cleanup GoogleModule.py to
	match our coding convention and share more code in the GoogleBase
	class. Fixes bug #514729

2008-02-06  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/DBus.py: fix dbus exposed IsConfigured method

2008-02-07  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py:
	* test/python-tests/TestDataProviderTomboy.py: Minor code cleanups
	
	* test/python-tests/TestDataProviderGoogle.py: Add test for the
	GoogleCalendar and Youtube dataproviders

2008-02-06  John Stowers  <john.stowers@gmail.com>

	* conduit/Web.py: Implement a better approach to lazy importing 
	gtkmozembed which fixes bug #512379.

2008-02-06  John Stowers  <john.stowers@gmail.com>

	* test/python-tests/common.py: Test is_configured() in all configure calls.

2008-02-06  John Stowers  <john.stowers@gmail.com>

	* conduit/dataproviders/Image.py:
	* conduit/modules/FlickrModule/FlickrModule.py:
	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/ShutterflyModule/ShutterflyModule.py:
	* conduit/modules/SmugMugModule/SmugMugModule.py: Add username property
	back to relevant modules. The last commit broke it.

2008-02-06  John Stowers  <john.stowers@gmail.com>

	* conduit/Synchronization.py:
	* conduit/dataproviders/DataProvider.py:
	* conduit/dataproviders/File.py:
	* conduit/dataproviders/Image.py:
	* conduit/modules/BackpackModule/BackpackModule.py:
	* conduit/modules/BansheeModule/BansheeModule.py:
	* conduit/modules/BoxDotNetModule/BoxDotNetModule.py:
	* conduit/modules/FileModule/FileModule.py:
	* conduit/modules/FlickrModule/FlickrModule.py:
	* conduit/modules/FspotModule/FspotModule.py:
	* conduit/modules/GmailModule/GmailModule.py:
	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/N800Module/N800Module.py:
	* conduit/modules/PicasaDesktopModule/PicasaDesktopModule.py:
	* conduit/modules/RhythmboxModule/RhythmboxModule.py:
	* conduit/modules/ShutterflyModule/ShutterflyModule.py:
	* conduit/modules/SmugMugModule/SmugMugModule.py:
	* conduit/modules/TestModule.py: Change is_configuration prototype
	to accept a isSource and a isTwoWay argument. This gives dataproviders
	enough information to make their configuration dependant on whether they
	are source/sink or one/two-way. Fixes bug #510091

2008-02-05  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GmailModule/GmailModule.py: Share some more code with
	the GmailEmailTwoWay dataprovider
	
	* test/python-tests/TestDataProviderGmail.py:
	* test/python-tests/common.py: Test GmailContactSource

2008-02-05  John Stowers  <john.stowers@gmail.com>

	* conduit/datatypes/Contact.py:
	* conduit/modules/GmailModule/GmailModule.py:
	* test/python-tests/TestCoreContact.py: Add a function to parse a vcf file
	into multiple Contact objects and use this to get the Gmail contacts 
	datasource to work and not be useless.

2008-02-05  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GmailModule/GmailModule.py:
	* conduit/modules/GmailModule/config.glade: First attempt at getting all 
	gmail contacts via the export to vcard URL. This should be sufficient, 
	and probbably the best way to get a oneway gmail contact dp going.

2008-02-04  John Stowers  <john.stowers@gmail.com>

	* conduit/Settings.py:
	* conduit/gtkui/Canvas.py: Specify the initial canvas size in gconf to make
	things easier to adjust on small screens (like the eeepc)

2008-01-28  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/GoogleModule/youtube-config.glade:
	* conduit/modules/GoogleModule/Makefile.am:
	* conduit/modules/GoogleModule/GoogleModule.py: move youtube dataprovider
	to GoogleModule, and make it use gdata api, 
	fixes bug #510129 (Renato Araujo Oliveira Filho)

	* conduit/modules/Makefile.am: deleted and moved to GoogleModule
	* conduit/modules/YouTubeModule/*: deleted and moved to GoogleModule

2008-01-27  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/FspotModule.py:
	* conduit/modules/FspotDbusModule.py: Move the dbus dataprovider in
	the FspotModule.py file, remove the old file.  No longer load the
	FSpotSource dataprovider, but always load the FSpotDBusTwoWay and
	error on refresh when the dbus interface is not there.  This more or
	less fixes bug #512146  (John Stowers)

2008-01-26  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/TomboyModule.py:
	* test/python-tests/TestDataProviderTomboy.py: Update to use the newer
	Tomboy S/GetNoteComplete API. This finally allows lossless sync of Tomboy
	notes including metadata such as tags. Fixes bug #510107

2008-01-24  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* conduit/modules/FspotModule/FspotDbusModule.py: Handle error when
	delete fails; and more important: the module is configured ok when no
	tag is selected.  When it's used as source it will sync the complete
	f-spot db, when it's used as sink no additional tags will be
	introduced

	* conduit/modules/GoogleModule/GoogleModule.py: Adds the photo tags
	when we're getting a file

2008-01-23  John Stowers  <john.stowers@gmail.com>

	* conduit/Main.py: Improve help message

	* conduit/modules/NetworkModule/Client.py:
	* conduit/modules/NetworkModule/Server.py:
	* conduit/modules/NetworkModule/XMLRPCUtils.py: Dont create a new Peerlister
	every time. Small improvements to hopefully improve cancellation.

	* tools/eog-plugin/conduit.py:
	* tools/eog-plugin/config.glade: Add Facebook and ShutterFly support. Clear
	the sidebar when sync finishes

2008-01-22  John Stowers  <john.stowers@gmail.com>

	* tools/eog-plugin/conduit.py: Improve eog plugin to show status while 
	synchronizing

2008-01-22  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GmailModule/GmailModule.py:
	* test/python-tests/TestDataProviderGmail.py: Fix GmailEmailTwoWay and
	add working test

2008-01-22  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GmailModule/GmailModule.py:
	* conduit/modules/GmailModule/config.glade: Fix the config window
	so that it saves configuration information and hides the password.
	Fixes bug #511017 (Julian Rötter)

2008-01-21  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GmailModule/GmailModule.py:
	* conduit/modules/GmailModule/Makefile.am:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/CHANGELOG:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/COPYING:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/Makefile.am:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/PKG-INFO:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/README:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/lgconstants.py:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/libgmail.py:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/setup.py:
	* conduit/modules/GmailModule/libgmail/CHANGELOG:
	* conduit/modules/GmailModule/libgmail/COPYING:
	* conduit/modules/GmailModule/libgmail/Makefile.am:
	* conduit/modules/GmailModule/libgmail/README:
	* conduit/modules/GmailModule/libgmail/gmail_transport.py:
	* conduit/modules/GmailModule/libgmail/lgconstants.py:
	* conduit/modules/GmailModule/libgmail/libgmail.py:
	* configure.ac:
	* scripts/update-3rdparty-libs.sh: Update libgmail to the CVS version

2008-01-20  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/iPodModule.py:
	* test/python-tests/TestDataProvideriPod.py:
	* test/python-tests/common.py:
	* test/python-tests/data/resources-ipod/iTunes/iTunesDB.ext: Fix ipod photos
	test (borrowed example test setup code from libgpod). Use the sample test
	functions for the ipod tests

2008-01-20  John Stowers  <john.stowers@gmail.com>

	* configure.ac: Pass make distcheck

2008-01-20  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/FileModule/FileConfiguration.py:
	* conduit/modules/FileModule/FileModule.py: Use set/get_current_folder_uri
	in the folderchooser. Fixes bug #510523

	* conduit/modules/FlickrModule/FlickrModule.py: Typo

	* conduit/modules/GoogleModule/libgdata/Makefile.am: Oops, rm directory

2008-01-20  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/GoogleModule/Makefile.am:
	* conduit/modules/GoogleModule/atom/Makefile.am:
	* conduit/modules/GoogleModule/gdata/Makefile.am:
	* conduit/modules/GoogleModule/gdata/calendar/Makefile.am:
	* conduit/modules/GoogleModule/gdata/exif/Makefile.am:
	* conduit/modules/GoogleModule/gdata/geo/Makefile.am:
	* conduit/modules/GoogleModule/gdata/media/Makefile.am:
	* conduit/modules/GoogleModule/gdata/photos/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/atom/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/atom/__init__.py:
	* conduit/modules/GoogleModule/libgdata/atom/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/auth.py:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/exif/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/exif/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/geo/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/geo/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/media/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/media/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/service.py:
	* configure.ac: Move libgdata -> gdata to be consistent with other modules
	and because it seems to be the easiest way to accomodate the case where
	the user has gdata installed, but an older version without photo support

2008-01-20  Thomas Van Machelen <thomas.vanmachelen@gmail.com>

	* configure.ac: include our gdata copy in the build
	* conduit/modules/GoogleModule/libgdata/*: Include our own copy of
	python-gdata. Currently at version 1.0.10; this will allow us to
	remove code when it's shipped on all new distro versions.

	* conduit/modules/Makefile.am: 
	* conduit/modules/PicasaModule/*: remove PicasaModule directory, it
	has moved to GoogleModule

	* conduit/modules/GoogleModule/GoogleModule.py: Move PicasaModule
	code, try to import our own gdata copy when the system one doesn't
	work, make PicasaTwoWay use the gdata bindings instead of our own
	limited custom ones. Fixes #510471
	
	* test/python-tests/TestDataProviderPicasa: change test to work with
	new gdata bindings

2008-01-19  John Stowers  <john.stowers@gmail.com>

	* test/python-tests/common.py:
	* test/python-tests/data/audio.list:
	* test/python-tests/data/file.list:
	* test/python-tests/data/image.list:
	* test/python-tests/data/simple-1.vcard:
	* test/python-tests/data/video.list: Add mechanism for specifying resources
	that live on a local machine, and can be used as part of the test process.
	This means that we can use local media, etc as resources for testing AV
	conversion, and not have to get files from the web
	
	* test/python-tests/TestCoreConvertAudioVideo.py: Test AV conversion of
	the local resources, as defined above

2008-01-19  John Stowers  <john.stowers@gmail.com>

	* conduit/datatypes/Video.py:
	* conduit/modules/AudioVideoConverterModule.py: Be more robust with
	audio/video mimetype dectection and conversion

2008-01-19  John Stowers  <john.stowers@gmail.com>

	* conduit/dataproviders/Image.py: Fix sync "crashing": NameError: 
	global name 'Rid' is not defined. Reported by maxxer

2008-01-18  John Stowers  <john.stowers@gmail.com>

	* conduit/Main.py:
	* conduit/Utils.py:
	* conduit/dataproviders/VolumeFactory.py:
	* conduit/modules/TomboyModule.py: Change Utils.dbus_service_available 
	so that the bus parameter is optional

	* scripts/continuous-tester.sh:
	* test/python-tests/TestDataProviderTomboy.py:
	* test/python-tests/TestSyncTomboyFolder.py:
	* test/python-tests/TestSyncTomboyiPod.py: Skip tomboy tests if tomboy
	is not running

	* test/python-tests/common.py: Run the sync tests by default

2008-01-18  John Carr  <john.carr@unrouted.co.uk>

	* conduit/modules/N800Module/N800Module.py: Update to detect N810

2008-01-18  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/FacebookModule/FacebookModule.py:
	* conduit/modules/FacebookModule/pyfacebook/__init__.py:
	* conduit/modules/FacebookModule/pyfacebook/no-print-at-import.patch:
	* scripts/update-3rdparty-libs.sh: Update to new pyfacebook

2008-01-18  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/FlickrModule/FlickrAPI/Makefile.am:
	* conduit/modules/FlickrModule/FlickrAPI/PKG-INFO:
	* conduit/modules/FlickrModule/FlickrAPI/flickrapi.py:
	* conduit/modules/FlickrModule/FlickrAPI/get-token-for-username.patch:
	* conduit/modules/FlickrModule/FlickrAPI/setup.py:
	* conduit/modules/FlickrModule/FlickrModule.py:
	* conduit/modules/FlickrModule/Makefile.am:
	* conduit/modules/FlickrModule/flickrapi/Makefile.am:
	* conduit/modules/FlickrModule/flickrapi/__init__.py:
	* conduit/modules/FlickrModule/flickrapi/multi-username.patch:
	* conduit/modules/FlickrModule/flickrapi/multipart.py:
	* conduit/modules/FlickrModule/flickrapi/reportinghttp.py:
	* conduit/modules/FlickrModule/flickrapi/tokencache.py:
	* conduit/modules/FlickrModule/flickrapi/xmlnode.py:
	* configure.ac:
	* scripts/update-3rdparty-libs.sh:
	* test/python-tests/TestDataProviderFlickr.py: Update to new flickrapi

2008-01-17  John Stowers  <john.stowers@gmail.com>

	* conduit/modules/FspotModule/FspotModule.py:
	* conduit/modules/FspotModule/config.glade: Sort the tags by name and
	allow search as you type in the config window. Fixes bug #509021 (maxxer)

2008-01-17  John Stowers  <john.stowers@gmail.com>

	* conduit/TypeConverter.py: Always use the most specific converter if
	available
	
	* conduit/modules/TomboyModule.py:
	* test/python-tests/TestDataProviderTomboy.py:
	* test/python-tests/TestSyncTomboyFolder.py: Use a TomboyNote datatype
	and implement converters. Update the tests to use this API

2008-01-17  John Stowers  <john.stowers@gmail.com>

	* conduit/__init__.py:
	* configure.ac: Post-release version bump