[conduit/config-unstable: 16/19] Merge branch 'config-google' into config-unstable



commit 3ec2fd8e36ecaff18a693b413e35338def1c4c71
Merge: 8c6ef3a... dcc51a1...
Author: Alexandre Rosenfeld <airmind gmail com>
Date:   Tue May 19 01:03:50 2009 -0300

    Merge branch 'config-google' into config-unstable

 conduit/ModuleWrapper.py                           |    7 +-
 conduit/SyncSet.py                                 |   24 +-
 conduit/XMLSerialization.py                        |  188 ++++++++
 conduit/dataproviders/DataProvider.py              |   60 +--
 conduit/gtkui/ConfigItems.py                       |   74 +++-
 conduit/modules/GoogleModule/GoogleModule.py       |  469 +++++++-------------
 conduit/modules/GoogleModule/Makefile.am           |    8 -
 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 ---------
 11 files changed, 431 insertions(+), 1285 deletions(-)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]