Don't prompt the user for a password if they're using a client certif…

…icate.

Conflicts:
	pgadmin/schema/pgServer.cpp

CHANGELOG

@@ -37,6 +37,8 @@ Changes
 
 Date       Dev Ver     Change details
 ---------- --- ------  --------------
+2013-05-17 DP  1.16.2  Don't prompt the user for a password if they're using
+                       a client certificate.
 2013-05-17 DP  1.16.2  Ensure global backups use the mintenance database to 
                        avoid access issue with postgres or template1.
 2013-05-17 DP  1.16.2  Fix SSL certificate authentication.

pgadmin/schema/pgServer.cpp

@@ -626,7 +626,7 @@ int pgServer::Connect(frmMain *form, bool askPassword, const wxString &pwd, bool
 		}
 		if (askPassword)
 		{
-			if (!passwordValid || !GetPasswordIsStored() || !GetStorePwd())
+			if ((!passwordValid || !GetPasswordIsStored() || !GetStorePwd()) && GetSSLCert() == wxEmptyString)
 			{
 				wxString txt;
 				txt.Printf(_("Please enter password for user %s\non server %s (%s)"), username.c_str(), description.c_str(), GetName().c_str());