[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdepim-3.5.5+/kpilot/lib
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2007-03-29 4:57:42
Message-ID: 1175144262.666909.21918.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 647681 by vanrijn:

- bringing back syncing conduits to kpilot/conduits/<username>.  this broke
  in 3.5.6.
- fixing missing spaces in syncAction.cc (" is running", not "is running")
- adding debug statement after dlp_CloseDB in pilotSerialDatabase.cc.
  believe it or not, this is where memofile conduit is causing my treo to
  reboot itself (when dlp_CloseDB is called).


 M  +1 -1      branches/work/kdepim-3.5.5+/kpilot/lib/pilotSerialDatabase.cc  
 M  +9 -0      branches/work/kdepim-3.5.5+/kpilot/lib/plugin.cc  
 M  +1 -1      branches/work/kdepim-3.5.5+/kpilot/lib/syncAction.cc  


--- branches/work/kdepim-3.5.5+/kpilot/lib/pilotSerialDatabase.cc #647680:647681
@@ -406,8 +406,8 @@
 	}
 
 	DEBUGKPILOT << fname << ": Closing DB handle #" << getDBHandle() << endl;
-
 	dlp_CloseDB(fDBSocket, getDBHandle());
+	DEBUGKPILOT << fname << ": after closing" << endl;
 	setDBOpen(false);
 }
 
--- branches/work/kdepim-3.5.5+/kpilot/lib/plugin.cc #647680:647681
@@ -328,6 +328,15 @@
 	KPILOT_DELETE(fLocalDatabase);
 
 	QString localPathName = PilotLocalDatabase::getDBPath() + name;
+
+	// we always want to use the conduits/ directory for our local
+	// databases. this keeps our backups and data that our conduits use
+	// for record keeping separate
+	localPathName.replace(CSL1("DBBackup/"), CSL1("conduits/"));
+
+	DEBUGKPILOT << fname << ": localPathName: [" << localPathName 
+		<< "]" << endl;
+
 	PilotLocalDatabase *localDB = new PilotLocalDatabase( localPathName );
 
 	if (!localDB)
--- branches/work/kdepim-3.5.5+/kpilot/lib/syncAction.cc #647680:647681
@@ -96,7 +96,7 @@
 	bool r = this->exec();
 
 	DEBUGKPILOT << fname << ": Exec " << name()
-		<< (r ? "is running" : "failed to start") << endl;
+		<< (r ? " is running" : " failed to start") << endl;
 
 	if (!r)
 	{
[prev in list] [next in list] [prev in thread] [next in thread]