additional cleanup after switch from .beagle to .recollweb

src/index/beaglequeue.cpp

@@ -180,11 +180,8 @@ BeagleQueueIndexer::BeagleQueueIndexer(RclConfig *cnf, Rcl::Db *db,
     : m_config(cnf), m_db(db), m_cache(0), m_updater(updfunc), 
       m_nocacheindex(false)
 {
-    if (!m_config->getConfParam("webqueuedir", m_queuedir))
-        m_queuedir = "~/.recollweb/ToIndex/";
-    m_queuedir = path_tildexpand(m_queuedir);
+    m_queuedir = m_config->getWebQueueDir();
     path_catslash(m_queuedir);
-
     m_cache = new BeagleQueueCache(cnf);
 }
 

src/index/fsindexer.cpp

@@ -187,7 +187,6 @@ bool FsIndexer::index()
     }
 
     m_walker.setSkippedPaths(m_config->getSkippedPaths());
-    m_walker.addSkippedPath(path_tildexpand("~/.beagle"));
     for (vector<string>::const_iterator it = m_tdl.begin();
 	 it != m_tdl.end(); it++) {
 	LOGDEB(("FsIndexer::index: Indexing %s into %s\n", it->c_str(), 
@@ -302,7 +301,6 @@ bool FsIndexer::indexFiles(list<string>& files, ConfIndexer::IxFlag flag)
     // We use an FsTreeWalker just for handling the skipped path/name lists
     FsTreeWalker walker;
     walker.setSkippedPaths(m_config->getSkippedPaths());
-    m_walker.addSkippedPath(path_tildexpand("~/.beagle"));
 
     for (list<string>::iterator it = files.begin(); it != files.end(); ) {
         LOGDEB2(("FsIndexer::indexFiles: [%s]\n", it->c_str()));

src/index/rclmonrcv.cpp

@@ -209,9 +209,7 @@ void *rclMonRcvRun(void *q)
 	bool doweb = false;
 	lconfig.getConfParam("processwebqueue", &doweb);
 	if (doweb) {
-	    string webqueuedir;
-	    if (!lconfig.getConfParam("webqueuedir", webqueuedir))
-		webqueuedir = path_tildexpand("~/.recollweb/ToIndex/");
+	    string webqueuedir = lconfig.getWebQueueDir();
 	    if (!mon->addWatch(webqueuedir, true)) {
 		LOGERR(("rclMonRcvRun: addwatch (webqueuedir) failed\n"));
 		if (mon->saved_errno != EACCES && mon->saved_errno != ENOENT)