SVN Commit by andreas: r4582 - in trunk/pgadmin3: . src/schema - Mailing list pgadmin-hackers

Author: andreas
Date: 2005-10-20 15:35:22 +0100 (Thu, 20 Oct 2005)
New Revision: 4582

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/schema/pgDatabase.cpp
Log:
Fix Unicode/pgsql80win32 hint

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-20 14:25:35 UTC (rev 4581)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-20 14:35:22 UTC (rev 4582)
@@ -17,7 +17,7 @@
 </ul>
 <br>
 <ul>
-<<<<<<< .mine
+    <li>2005-10-20 AP  1.4B4 Fix Unicode/pgsql80win32 hint (r: Oryza Triznyak)
     <li>2005-10-20 DP  1.4B4 Ensure the user can cancel the maintenance dialogue when it is running.
     <li>2005-10-20 DP  1.4B4 Fix the recent files list on the config file editor. (r: Miha Radej)
     <li>2005-10-18 DP  1.4B3 Correct font size on Splash and About forms on Mac.

Modified: trunk/pgadmin3/src/schema/pgDatabase.cpp
===================================================================
--- trunk/pgadmin3/src/schema/pgDatabase.cpp    2005-10-20 14:25:35 UTC (rev 4581)
+++ trunk/pgadmin3/src/schema/pgDatabase.cpp    2005-10-20 14:35:22 UTC (rev 4582)
@@ -138,7 +138,7 @@
     if (encoding == wxT("UNICODE"))
     {
         wxString ver=GetServer()->GetVersionString();
-        if (ver.Find(wxT("mingw32")) > 0 && ver.Find(wxT("SQL 8.0.") > 0))
+        if (ver.Find(wxT("mingw32")) > 0 && ver.Find(wxT("SQL 8.0.")) > 0)
             return true;
     }

@@ -158,7 +158,11 @@
     if (encoding == wxT("SQL_ASCII"))
         hints.Add(HINT_ENCODING_ASCII);
     else if (encoding == wxT("UNICODE"))
-        hints.Add(HINT_ENCODING_UNICODE);
+    {
+        wxString ver=GetServer()->GetVersionString();
+        if (ver.Find(wxT("mingw32")) > 0 && ver.Find(wxT("SQL 8.0.")) > 0)
+            hints.Add(HINT_ENCODING_UNICODE);
+    }

     if (GetServer()->GetConnection() == GetConnection() &&
         GetConnection()->BackendMinimumVersion(8,0) &&