[conduit/google-calendar: 173/173] Merge branch 'master' into google-calendar
- From: John Carr <johncarr src gnome org>
- To: svn-commits-list gnome org
- Subject: [conduit/google-calendar: 173/173] Merge branch 'master' into google-calendar
- Date: Thu, 21 May 2009 06:07:52 -0400 (EDT)
commit b47d49cea01f573e56ddadb77916a07d92b7b605
Merge: e27d3d8... 30a5a92...
Author: John Carr <john carr unrouted co uk>
Date: Thu May 21 11:04:49 2009 +0100
Merge branch 'master' into google-calendar
Conflicts:
conduit/modules/GoogleModule/GoogleModule.py
.gitignore | 3 +
INSTALL | 143 +-
conduit/Makefile.am | 3 +-
conduit/ModuleWrapper.py | 10 +-
conduit/SyncSet.py | 24 +-
conduit/Vfs.py | 13 +
conduit/XMLSerialization.py | 192 ++
conduit/dataproviders/DataProvider.py | 60 +-
conduit/gtkui/Canvas.py | 18 +-
conduit/gtkui/ConfigItems.py | 95 +-
conduit/modules/EvolutionModule/Makefile.am | 2 +-
conduit/modules/FeedModule/Makefile.am | 2 +-
conduit/modules/FileModule/FileConfiguration.py | 229 +--
conduit/modules/FileModule/FileModule.py | 118 +-
conduit/modules/FileModule/Makefile.am | 5 +-
conduit/modules/FileModule/config.glade | 369 ----
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/ShutterflyModule/Makefile.am | 3 -
.../modules/ShutterflyModule/ShutterflyModule.py | 57 +-
conduit/modules/ShutterflyModule/shutterfly.glade | 145 --
conduit/modules/SmugMugModule/Makefile.am | 3 -
conduit/modules/SmugMugModule/SmugMugModule.py | 69 +-
conduit/modules/SmugMugModule/config.glade | 170 --
conduit/modules/TestModule.py | 25 -
conduit/modules/iPodModule/Makefile.am | 2 +-
conduit/modules/iPodModule/iPodModule.py | 13 +-
conduit/platform/FileGio.py | 1 +
conduit/platform/FileGnomeVfs.py | 1 +
conduit/platform/FilePython.py | 1 +
conduit/platform/__init__.py | 1 +
conduit/utils/Makefile.am | 3 +-
conduit/utils/MediaFile.py | 10 +-
conduit/utils/Wait.py | 14 +
po/POTFILES.in | 6 -
po/POTFILES.skip | 2 +-
po/pt.po | 2179 ++++++++++----------
scripts/run-tests.sh | 9 +-
test/python-tests/AutoGenerate.py | 83 -
test/python-tests/AutoSoup.py | 175 --
test/python-tests/AutoTemplate.py | 197 --
test/python-tests/TestCoreVfs.py | 4 +-
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/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 | 53 +
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 ++++
83 files changed, 3774 insertions(+), 3947 deletions(-)
diff --cc conduit/modules/GoogleModule/GoogleModule.py
index 18da110,78f4cab..5373bc2
--- a/conduit/modules/GoogleModule/GoogleModule.py
+++ b/conduit/modules/GoogleModule/GoogleModule.py
@@@ -55,11 -54,16 +55,16 @@@ FORMAT_STRING = "%Y-%m-%dT%H:%M:%S
class _GoogleBase:
_configurable_ = True
def __init__(self, service):
- self.username = ""
- self.password = ""
+ self.update_configuration(
+ username = ("", self._set_username),
+ password = ("", self._set_password),
+ authenticated = False,
+ )
self.loggedIn = False
self.service = service
+ self._status = "Not authenticated"
+ self.status_config = None
-
+
if conduit.GLOBALS.settings.proxy_enabled():
log.info("Configuring proxy for %s" % self.service)
host,port,user,password = conduit.GLOBALS.settings.get_proxy()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]