[conduit/iphone: 20/20] Merge branch 'master' into iphone

[John Stowers <jstowers src gnome org>]

commit 0b2a9891c7cc3110a19597b436b95fccf34ede5c
Merge: 17ea592 ca2e571
Author: John Stowers <john stowers gmail com>
Date:   Thu Sep 23 15:16:57 2010 +1200

    Merge branch 'master' into iphone
    
    Conflicts:
    	conduit/modules/iPodModule/iPodModule.py

 conduit/DBus.py                                    |    5 +
 conduit/Globals.py                                 |    8 +
 conduit/Main.py                                    |   30 +-
 conduit/Makefile.am                                |    2 -
 conduit/Settings.py                                |    2 +-
 conduit/Synchronization.py                         |    4 +-
 conduit/Web.py                                     |    6 +-
 conduit/__init__.py                                |    2 +-
 conduit/conduit                                    |   35 +-
 conduit/conduit.real                               |   24 -
 conduit/dataproviders/__init__.py                  |    2 +-
 conduit/gtkui/Canvas.py                            |    8 +-
 conduit/gtkui/UI.py                                |   55 +-
 conduit/modules/FileModule/FileModule.py           |    3 +-
 conduit/modules/FspotModule/FspotModule.py         |    9 +-
 conduit/modules/Makefile.am                        |    1 -
 conduit/modules/RhythmboxModule/RhythmboxModule.py |   34 +-
 conduit/modules/TomboyModule.py                    |   11 +-
 .../{ => UNSUPPORTED}/GoogleModule/GoogleModule.py |    0
 .../{ => UNSUPPORTED}/GoogleModule/Makefile.am     |    0
 .../{ => UNSUPPORTED}/GoogleModule/__init__.py     |    0
 .../GoogleModule/contacts_example.py               |    0
 conduit/platform/Makefile.am                       |    3 +-
 conduit/platform/WebBrowserMozilla.py              |  139 ----
 conduit/platform/__init__.py                       |    3 +-
 conduit/utils/__init__.py                          |    9 -
 configure.ac                                       |   14 +-
 data/conduit-progress.svg                          |  831 --------------------
 data/conduit.ui                                    |   13 +-
 data/icons/hicolor/16x16/status/Makefile.am        |    8 -
 .../hicolor/16x16/status/conduit-progress-1.png    |  Bin 761 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-2.png    |  Bin 777 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-3.png    |  Bin 738 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-4.png    |  Bin 783 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-5.png    |  Bin 763 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-6.png    |  Bin 748 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-7.png    |  Bin 765 -> 0 bytes
 .../hicolor/16x16/status/conduit-progress-8.png    |  Bin 747 -> 0 bytes
 po/cs.po                                           |  469 ++---------
 po/sl.po                                           |  210 +++---
 scripts/CheckGtkMozEmbed.py                        |   12 -
 41 files changed, 302 insertions(+), 1650 deletions(-)
---