From: | svn(at)pgadmin(dot)org |
---|---|
To: | pgadmin-hackers(at)postgresql(dot)org |
Subject: | SVN Commit by andreas: r4818 - trunk/pgadmin3/src/schema |
Date: | 2005-12-09 12:50:12 |
Message-ID: | 200512091250.jB9CoCrP024889@developer.pgadmin.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgadmin-hackers |
Author: andreas
Date: 2005-12-09 12:50:11 +0000 (Fri, 09 Dec 2005)
New Revision: 4818
Modified:
trunk/pgadmin3/src/schema/pgServer.cpp
Log:
Debug log of password file location
Modified: trunk/pgadmin3/src/schema/pgServer.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgServer.cpp 2005-12-09 11:02:49 UTC (rev 4817)
+++ trunk/pgadmin3/src/schema/pgServer.cpp 2005-12-09 12:50:11 UTC (rev 4818)
@@ -418,6 +418,8 @@
#else
+ wxT("/.pgpass");
#endif
+
+ wxLogInfo(wxT("Using password file %s"), fname.c_str());
return fname;
}
@@ -443,11 +445,21 @@
wxString seekStr= GetName() + wxT(":")
+ NumToStr((long)GetPort()) + wxT(":*:")
+ username + wxT(":") ;
+#if wxUSE_UNICODE
+ wxString seekStr2= wxString(GetName().mb_str(wxConvUTF8), wxConvLibc) + wxT(":")
+ + NumToStr((long)GetPort()) + wxT(":*:")
+ + wxString(username.mb_str(wxConvUTF8), wxConvLibc) + wxT(":") ;
+#endif
+
while (lines.HasMoreTokens())
{
wxString str=lines.GetNextToken();
if (str.Left(seekStr.Length()) == seekStr)
return true;
+#if wxUSE_UNICODE
+ if (str.Left(seekStr2.Length()) == seekStr2)
+ return true;
+#endif
}
}
From | Date | Subject | |
---|---|---|---|
Next Message | svn | 2005-12-09 12:50:36 | SVN Commit by andreas: r4819 - branches/REL-1_4_0_PATCHES/pgadmin3/src/schema |
Previous Message | Dave Page | 2005-12-09 11:21:41 | Ready for 1.4.1? |