[conduit/tracker: 177/179] Merge branch 'master' into tracker

[John Carr <johncarr src gnome org>]

commit c743da13edad9e681e9ca6426da170fd90362727
Merge: 2841bb0... 52710b0...
Author: John Carr <john carr unrouted co uk>
Date:   Tue Jun 9 11:34:02 2009 +0100

    Merge branch 'master' into tracker

 .gitignore                                         |    3 +
 INSTALL                                            |  143 ++++--
 conduit/DBus.py                                    |   28 +-
 conduit/Makefile.am                                |    3 +-
 conduit/ModuleWrapper.py                           |   10 +-
 conduit/SyncSet.py                                 |   24 +-
 conduit/XMLSerialization.py                        |  192 ++++++++
 conduit/dataproviders/DataProvider.py              |   60 +--
 conduit/gtkui/Canvas.py                            |   18 +-
 conduit/gtkui/ConfigItems.py                       |   74 +++-
 conduit/modules/EvolutionModule/Makefile.am        |    2 +-
 conduit/modules/FeedModule/Makefile.am             |    2 +-
 conduit/modules/FileModule/FileConfiguration.py    |  192 +++++----
 conduit/modules/FileModule/FileModule.py           |   65 +++-
 conduit/modules/FileModule/Makefile.am             |    5 +-
 conduit/modules/FileModule/config.glade            |  369 ---------------
 conduit/modules/FlickrModule/FlickrModule.py       |   35 +-
 conduit/modules/GoogleModule/GoogleModule.py       |  471 +++++++-------------
 conduit/modules/GoogleModule/Makefile.am           |   14 +-
 conduit/modules/GoogleModule/contacts-config.glade |  260 -----------
 .../modules/GoogleModule/documents-config.glade    |  216 ---------
 conduit/modules/GoogleModule/picasa-config.glade   |  195 --------
 conduit/modules/GoogleModule/youtube-config.glade  |  215 ---------
 conduit/modules/TestModule.py                      |   25 -
 conduit/modules/iPodModule/Makefile.am             |    2 +-
 conduit/modules/iPodModule/iPodModule.py           |   52 ++-
 conduit/platform/FileGio.py                        |    2 +-
 conduit/utils/Makefile.am                          |    3 +-
 conduit/utils/MediaFile.py                         |   10 +-
 conduit/utils/Wait.py                              |   14 +
 po/POTFILES.in                                     |    6 -
 po/POTFILES.skip                                   |    2 +-
 po/de.po                                           |  334 +++++++--------
 po/es.po                                           |  341 +++++++--------
 scripts/run-tests.sh                               |    9 +-
 test/python-tests/AutoGenerate.py                  |   83 ----
 test/python-tests/AutoSoup.py                      |  175 --------
 test/python-tests/AutoTemplate.py                  |  197 --------
 test/soup/__init__.py                              |   20 +
 test/soup/data/__init__.py                         |   82 ++++
 test/soup/data/bookmark.py                         |   22 +
 test/soup/data/contact.py                          |   22 +
 test/soup/data/email.py                            |   22 +
 test/soup/data/event.py                            |   23 +
 test/soup/data/file.py                             |   22 +
 test/soup/data/music.py                            |   20 +
 test/soup/data/note.py                             |   22 +
 test/soup/data/note_tomboy.py                      |   22 +
 test/soup/data/photo.py                            |   20 +
 test/soup/data/setting.py                          |   21 +
 test/soup/data/test.py                             |   21 +
 test/soup/data/text.py                             |   24 +
 test/soup/data/video.py                            |   20 +
 test/soup/env/__init__.py                          |   49 ++
 test/soup/env/cov.py                               |   42 ++
 test/soup/env/dbus-monitor.py                      |   24 +
 test/soup/env/debug.py                             |   16 +
 test/soup/env/fake-dbus.py                         |   39 ++
 test/soup/env/fake-session-bus.conf.in             |   13 +
 test/soup/env/profile.py                           |   29 ++
 test/soup/env/xvfb.py                              |   89 ++++
 test/soup/modules/__init__.py                      |   68 +++
 test/soup/modules/evolution.py                     |   45 ++
 test/soup/modules/feed.py                          |   30 ++
 test/soup/modules/folder.py                        |   24 +
 test/soup/modules/google.py                        |   38 ++
 test/soup/modules/ipod.py                          |   59 +++
 test/soup/modules/n800.py                          |   43 ++
 test/soup/modules/tomboy.py                        |   20 +
 test/soup/soup                                     |   91 ++++
 test/soup/test_dataprovider.py                     |   89 ++++
 test/soup/test_datatypes.py                        |   65 +++
 test/soup/test_synchronization.py                  |  265 +++++++++++
 test/soup/utils/pluginloader.py                    |   34 ++
 test/soup/utils/progressbar.py                     |   70 +++
 test/soup/utils/test.py                            |  361 +++++++++++++++
 76 files changed, 3111 insertions(+), 2726 deletions(-)