--- a/lib/my_db.py	Fri Oct 24 14:19:30 2003 -0400
+++ b/lib/my_db.py	Fri Oct 24 17:04:29 2003 -0400
@@ -62,6 +62,7 @@
 			DELETE FROM users WHERE id = %d;
 			DELETE FROM bookmarks_keywords WHERE userid = %d;
 			DELETE FROM bookmarks WHERE userid = %d;
+			DELETE FROM preferences WHERE userid = %d;
 			DELETE FROM keywords WHERE userid = %d;
 			DELETE FROM db_sequence WHERE userid = %d;
 			""" % (userid,userid,userid,userid,userid))
@@ -70,7 +71,7 @@
 		self.crs.execute("""
 			SELECT p.keywords_box,
 			p.keywords_sort, p.keywords_reverse,
-			u.full_name
+			u.full_name, p.default_view
 			FROM preferences p, users u
 			WHERE u.id = %d AND p.userid = u.id;
 			""" % (self.userid,))
@@ -79,7 +80,8 @@
 		   'keywords_box' : res[0],
 		   'keywords_sort' : res[1],
 		   'keywords_reverse': res[2],
-		   'fullname': res[3]
+		   'fullname': res[3],
+		   'default_view': res[4]
 		   }
 	def set_preferences(self, prefs):
 	        if prefs['keywords_reverse']:
@@ -90,11 +92,12 @@
 			UPDATE preferences
 			SET keywords_box = %d,
 			keywords_sort = %s,
-			keywords_reverse = %s
+			keywords_reverse = %s,
+			default_view = %d
 			WHERE userid = %d;
 			""" % (prefs['keywords_box'],
 			sql_quote(prefs['keywords_sort']),
-			rev, self.userid))
+			rev, prefs['default_view'], self.userid))
 		self.crs.execute("""
 			UPDATE users
 			SET full_name = %s
@@ -322,7 +325,7 @@
 	def remove_folders(self, id, commit = 1):
 		if id == 0:
 			raise "Can't erase base folder!"
-		subs = self.get_subfolders(self, id)
+		subs = self.get_subfolders(id)
 		for sub in subs:
 			self.remove_folder(sub[0], 0)
 		self.crs.execute("""