[Kexi] koffice/kexi

[Jaroslaw Staniek]

SVN commit 520542 by staniek:

KexiDB
- Use local sockets by default for local server connections, if possible.
  This fixes possible problems when users have local connections filtered out by a firewall.
  Thanks to Robin Atwood.

CCMAIL: robin at binro.org
CCMAIL: kexi at kde.org



 M  +4 -0      doc/dev/CHANGELOG-Kexi-js  
 M  +1 -1      kexidb/connectiondata.cpp  
 M  +11 -4     kexidb/connectiondata.h  
 M  +1 -1      main/keximainwindowimpl.cpp  


--- trunk/koffice/kexi/doc/dev/CHANGELOG-Kexi-js #520541:520542
@@ -9,6 +9,10 @@
 For most important commits use: CCMAIL:kexi-devel at kde.org
 Use CCMAIL:###-done at bugs.kde.org
 
+2006-03-20
+KexiDB
+- use local sockets by default for local server connections, if possible
+
 ~~~~~~~~~~~~~~~~ 1.0 beta 2 (with KOffice 1.5) ~~~~~~~~~~~~~~~~
 
 2006-02-28, 03-03
--- trunk/koffice/kexi/kexidb/connectiondata.cpp #520541:520542
@@ -43,7 +43,7 @@
 /*================================================================*/
 
 ConnectionDataBase::ConnectionDataBase()
-	: id(-1), port(0), useLocalSocketFile(false), savePassword(false)
+	: id(-1), port(0), useLocalSocketFile(true), savePassword(false)
 {
 }
 
--- trunk/koffice/kexi/kexidb/connectiondata.h #520541:520542
@@ -90,22 +90,29 @@
 		/*! 
 		\brief True if local socket file should be used instead of TCP/IP port.
 		
-		For local connections only. False by default.
-		If true, @a hostName and @a port will be ignored.
+		Only meaningful for connections with localhost as server.
+		True by default, so local communication can be optimized, and users can avoid problems 
+		with TCP/IP connections disabled by firewalls.
+		
+		If true, @a hostName and @a port will be ignored and @a localSocketFileName will be used.
+		On MS Windows this option is often ignored and TCP/IP connection to the localhost is performed.
 		*/
 		bool useLocalSocketFile;
 
 		/*! 
 		\brief Name of local (named) socket file. 
 		
-		For local connections only. Empty by default.
+		For local connections only. If empty, it's driver will try to locate existing local socket
+		file. Empty by default.
 		*/
 		QString localSocketFileName;
 		
 		/*!
 		\brief Password used for the connection.
 
-		Can be empty. */
+		Can be empty string or null. If it is empty (equal to ""), empty password is passed to the driver.
+		If it is null (QString::null), no password is passed to the driver.
+		In this case, applications using KexiDB should ask for the password. */
 		QString password;
 
 		/*!
--- trunk/koffice/kexi/main/keximainwindowimpl.cpp #520541:520542
@@ -294,7 +294,7 @@
 	const QString txt = i18n("&Window");
 	int i;
 	for (i=0; i<count; i++) {
-		kdDebug() << menuBar()->text( menuBar()->idAt(i) ) << endl;
+		//kdDebug() << menuBar()->text( menuBar()->idAt(i) ) << endl;
 		if (txt==menuBar()->text( menuBar()->idAt(i) ))
 			break;
 	}