[conduit/config-unstable: 11/11] Merge branch 'master' into config-unstable

[John Stowers <jstowers src gnome org>]

commit 55cf90ad270cd2953869e8572d570fc2404d71cf
Merge: 44b8b16... 15c2c38...
Author: John Stowers <john stowers gmail com>
Date:   Sat Apr 25 14:21:47 2009 +1200

    Merge branch 'master' into config-unstable
    
    Conflicts:
    	conduit/modules/FileModule/FileConfiguration.py
    	conduit/modules/FileModule/FileModule.py

 .gitignore                                         |   28 +
 conduit-glib/COPYING                               |    1 -
 conduit-glib/ChangeLog                             |    3 -
 conduit-glib/INSTALL                               |    1 -
 conduit-glib/MAINTAINERS                           |    3 -
 conduit-glib/Makefile.am                           |   38 -
 conduit-glib/Makefile.decl                         |   60 --
 conduit-glib/NEWS                                  |    1 -
 conduit-glib/TODO.tasks                            |    3 -
 conduit-glib/autogen.sh                            |  172 ----
 conduit-glib/conduit-glib.anjuta                   |   44 -
 conduit-glib/conduit-glib.pc.in                    |   11 -
 conduit-glib/conduit-glib/.cvsignore               |   17 -
 conduit-glib/conduit-glib/Makefile.am              |   68 --
 conduit-glib/conduit-glib/conduit-g-application.c  |  319 --------
 conduit-glib/conduit-glib/conduit-g-application.h  |   78 --
 conduit-glib/conduit-glib/conduit-g-conduit.c      |  261 ------
 conduit-glib/conduit-glib/conduit-g-conduit.h      |   64 --
 conduit-glib/conduit-glib/conduit-g-dataprovider.c |  219 -----
 conduit-glib/conduit-glib/conduit-g-dataprovider.h |   81 --
 conduit-glib/conduit-glib/conduit-g-syncset.c      |  130 ---
 conduit-glib/conduit-glib/conduit-g-syncset.h      |   67 --
 conduit-glib/conduit-glib/conduit-glib-globals.h   |   45 -
 conduit-glib/conduit-glib/conduit-glib.h           |   32 -
 conduit-glib/conduit-glib/conduit-marshal.list     |    2 -
 conduit-glib/configure.ac                          |   92 ---
 conduit-glib/data/Makefile.am                      |    6 -
 conduit-glib/data/application.xml                  |   41 -
 conduit-glib/data/conduit.xml                      |   57 --
 conduit-glib/data/dataprovider.xml                 |   31 -
 conduit-glib/data/generate-instrospection-xml.py   |   68 --
 conduit-glib/data/syncset.xml                      |   26 -
 conduit-glib/depcomp                               |    1 -
 conduit-glib/docs/Makefile.am                      |    1 -
 conduit-glib/docs/reference/Makefile.am            |   53 --
 conduit-glib/docs/reference/conduit-glib-docs.sgml |   13 -
 .../docs/reference/conduit-glib-sections.txt       |   11 -
 conduit-glib/docs/reference/conduit-glib.types     |    1 -
 conduit-glib/install-sh                            |    1 -
 conduit-glib/missing                               |    1 -
 conduit-glib/po/.cvsignore                         |   23 -
 conduit-glib/po/ChangeLog                          |    7 -
 conduit-glib/po/LINGUAS                            |    2 -
 conduit-glib/po/Makefile.in.in                     |  218 -----
 conduit-glib/po/POTFILES.in                        |    7 -
 conduit-glib/test/Makefile.am                      |   18 -
 conduit-glib/test/test-application.c               |  116 ---
 conduit-sharp/AUTHORS                              |    2 -
 conduit-sharp/COPYING                              |    1 -
 conduit-sharp/ChangeLog                            |   23 -
 conduit-sharp/INSTALL                              |    1 -
 conduit-sharp/Makefile.am                          |    9 -
 conduit-sharp/README                               |    5 -
 conduit-sharp/aclocal.m4                           |  776 ------------------
 conduit-sharp/autogen.sh                           |   58 --
 conduit-sharp/conduit-sharp.mds                    |   20 -
 conduit-sharp/conduit-sharp.pc.in                  |   10 -
 conduit-sharp/configure.ac                         |   69 --
 conduit-sharp/src/Application.cs                   |   74 --
 conduit-sharp/src/AssemblyInfo.cs.in               |    7 -
 conduit-sharp/src/Conduit.cs                       |  109 ---
 conduit-sharp/src/DataProvider.cs                  |   65 --
 conduit-sharp/src/Delegates.cs                     |   12 -
 conduit-sharp/src/Exporter.cs                      |   49 --
 conduit-sharp/src/Makefile.am                      |   30 -
 conduit-sharp/src/SyncSet.cs                       |   88 --
 conduit-sharp/src/Util.cs                          |   11 -
 conduit-sharp/src/conduit-sharp.snk                |  Bin 596 -> 0 bytes
 conduit-sharp/src/src.mdp                          |   29 -
 conduit-sharp/test/Makefile.am                     |   14 -
 conduit-sharp/test/test-application.cs             |   16 -
 conduit-sharp/test/test-conduit.cs                 |   41 -
 conduit-sharp/test/test.mdp                        |   24 -
 conduit.doap                                       |    2 +
 conduit/Vfs.py                                     |   13 +
 conduit/gtkui/ConfigItems.py                       |   21 +-
 conduit/modules/FileModule/FileConfiguration.py    |   38 -
 conduit/modules/FileModule/FileModule.py           |   42 +-
 conduit/platform/FileGio.py                        |    1 +
 conduit/platform/FileGnomeVfs.py                   |    1 +
 conduit/platform/FilePython.py                     |    1 +
 conduit/platform/__init__.py                       |    1 +
 help/ChangeLog                                     |    5 +
 help/de/de.po                                      |  857 +++++---------------
 help/de/figures/conduit-folder-configuration.png   |  Bin 0 -> 19548 bytes
 m4/gnome-doc-utils.m4                              |    3 +-
 m4/intltool.m4                                     |   64 +-
 po/ChangeLog                                       |    4 +
 po/de.po                                           |  417 +++++-----
 test/python-tests/TestCoreVfs.py                   |    4 +-
 90 files changed, 516 insertions(+), 5043 deletions(-)

diff --cc conduit/modules/FileModule/FileConfiguration.py
index baef36b,8a96204..2f65974
--- a/conduit/modules/FileModule/FileConfiguration.py
+++ b/conduit/modules/FileModule/FileConfiguration.py
@@@ -314,42 -301,3 +314,4 @@@ class _FileSourceConfigurator(Vfs.Folde
                  warning.destroy()
                  dialog.emit_stop_by_name("response")
  
- class _FolderTwoWayConfigurator:
-     def __init__(self, mainWindow, folder, includeHidden, compareIgnoreMtime, followSymlinks):
-         log.debug("Starting new folder chooser at %s" % folder)
-         self.folder = folder
-         self.includeHidden = includeHidden
-         self.compareIgnoreMtime = compareIgnoreMtime
-         self.followSymlinks = followSymlinks
- 
-         tree = Utils.dataprovider_glade_get_widget(
-                         __file__,
-                         "config.glade",
- 						"FolderTwoWayConfigDialog"
- 						)
-         self.folderChooser = tree.get_widget("filechooserbutton1")
-         self.folderChooser.set_current_folder_uri(self.folder)
-         self.hiddenCb = tree.get_widget("hidden")
-         self.hiddenCb.set_active(includeHidden)
-         self.mtimeCb = tree.get_widget("ignoreMtime")
-         self.mtimeCb.set_active(self.compareIgnoreMtime)
-         self.followSymlinksCb = tree.get_widget("followSymlinks")
-         self.followSymlinksCb.set_active(self.followSymlinks)
- 
-         self.dlg = tree.get_widget("FolderTwoWayConfigDialog")
-         self.dlg.connect("response",self.on_response)
-         self.dlg.set_transient_for(mainWindow)
- 
-     def on_response(self, dialog, response_id):
-         if response_id == gtk.RESPONSE_OK:
-             self.folder = self.folderChooser.get_uri()
-             log.debug("Folderconfig returned %s" % self.folder)
-             self.includeHidden = self.hiddenCb.get_active()
-             self.compareIgnoreMtime = self.mtimeCb.get_active()
-             self.followSymlinks = self.followSymlinksCb.get_active()
 +
-     def show_dialog(self):
-         self.dlg.show_all()
-         self.dlg.run()
-         self.dlg.destroy()
-         return self.folder, self.includeHidden, self.compareIgnoreMtime, self.followSymlinks
diff --cc conduit/modules/FileModule/FileModule.py
index bf28790,d9894ab..1799f0b
--- a/conduit/modules/FileModule/FileModule.py
+++ b/conduit/modules/FileModule/FileModule.py
@@@ -121,13 -78,8 +121,14 @@@ class FolderTwoWay(FileDataProvider.Fol
                  self.DEFAULT_COMPARE_IGNORE_MTIME,
                  self.DEFAULT_FOLLOW_SYMLINKS
                  )
 +        self.update_configuration(
 +            folder = self.DEFAULT_FOLDER,
 +            includeHidden = self.DEFAULT_HIDDEN,
 +            compareIgnoreMtime = self.DEFAULT_COMPARE_IGNORE_MTIME,
 +            followSymlinks = self.DEFAULT_FOLLOW_SYMLINKS,
 +        )     
          AutoSync.AutoSync.__init__(self)
+ 
          self._monitor = Vfs.FileMonitor()
          self._monitor.connect("changed", self._monitor_folder_cb)