Skip site navigation (1) Skip section navigation (2)

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

From: svn(at)pgadmin(dot)org
To: pgadmin-hackers(at)postgresql(dot)org
Subject: SVN Commit by andreas: r4819 - branches/REL-1_4_0_PATCHES/pgadmin3/src/schema
Date: 2005-12-09 12:50:36
Message-ID: 200512091250.jB9Coa0T024901@developer.pgadmin.org (view raw or flat)
Thread:
Lists: pgadmin-hackers
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
         }
     }
     


pgadmin-hackers by date

Next:From: Andreas PflugDate: 2005-12-09 12:54:20
Subject: Re: SVN Commit by dpage: r4809 - branches/REL-1_4_0_PATCHES/pgadmin3/i18n/fr_FR
Previous:From: svnDate: 2005-12-09 12:50:12
Subject: SVN Commit by andreas: r4818 - trunk/pgadmin3/src/schema

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group