SVN Commit by andreas: r4819 - branches/REL-1_4_0_PATCHES/pgadmin3/src/schema

Author: andreas
Date: 2005-12-09 12:50:36 +0000 (Fri, 09 Dec 2005)
New Revision: 4819

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgServer.cpp
Log:
Debug log of password file location

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgServer.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgServer.cpp    2005-12-09 12:50:11 UTC (rev 4818)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgServer.cpp    2005-12-09 12:50:36 UTC (rev 4819)
@@ -417,6 +417,8 @@
 #else
         + wxT("/.pgpass");
 #endif
+
+    wxLogInfo(wxT("Using password file %s"), fname.c_str());
     return fname;
 }

@@ -442,11 +444,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
         }
     }