--- pybackpack-nautilus.py.old	2007-12-09 16:24:44.000000000 +0000
+++ pybackpack-nautilus.py	2007-12-09 16:25:13.000000000 +0000
@@ -24,12 +24,12 @@
 # display list of backup sets to send selected files to
 # iterate over selected files, add them to filelist
 
-
+import os
 import nautilus
 import urllib
 import pybackpack
-import pybackpack.rdiff_interface as rdiff_interface
-
+import pybackpack.version as version
+from pybackpack.backupsets import BackupSets
 
 class PyBackPackAdd(nautilus.MenuProvider):
     def __init__(self):
@@ -37,15 +37,15 @@
         
 
     def get_file_items(self, window, files):
-        rdiff_interface.FindSets()
-        self._backup_sets = rdiff_interface.backupsets
+        configdir = os.path.join(os.environ['HOME'], '.'+version.APPPATH)
+        bsets = BackupSets(configdir)
         items = []
-        for bset in self._backup_sets:
-            if bset['name'] == 'home':
+        for bset in bsets:
+            if bset.name == 'home':
                 continue
-            name = 'Nautilus::add_to_backup_%s' % bset['name']
-            label = 'Add to backup %s' % bset['name']
-            tip = "Add current file(s) to backup set %s" % bset['name']
+            name = 'Nautilus::add_to_backup_%s' % bset.name
+            label = 'Add to backup %s' % bset.name
+            tip = "Add current file(s) to backup set %s" % bset.name
             item = nautilus.MenuItem(name, label, tip)
             item.connect('activate', self.menu_activate_cb, files, bset)
             items.append(item)
@@ -59,23 +59,10 @@
             if file.get_uri_scheme() != 'file':
                 continue
             filename = urllib.unquote(file.get_uri()[7:])
-            if filename in backup['filelist_inc']:
+            if filename in backup.files_include:
                 continue
                            
             real_files.append(filename)
-        total_files = backup['filelist_inc'] + real_files
-        total_files.sort()
-        
-        flist = []
-        for file in total_files:
-            flist.append((file, True))
-        extrakeys = {'default_dest':backup['default_dest'],
-                     'removable':backup['removable']}    
-                     
-        rdiff_interface.WriteSet(backup['name'],
-                    backup['desc'],
-                    flist,
-                    True, extrakeys)
-                    
-
 
+        backup.files_include.extend(real_files)
+        backup.write()