CVS Commit by dpage: Fix a couple of compile errors from back-patched

[cvs(at)developer(dot)pgadmin(dot)org]

Log Message:
-----------
Fix a couple of compile errors from back-patched fixes. Hopefully nothing else was missed :-)

Tags:
----
REL-1_2_0_PATCHES

Modified Files:
--------------
    pgadmin3/src/include:
        pgConn.h (r1.27.2.1 -> r1.27.2.2)
    pgadmin3/src/schema:
        pgDomain.cpp (r1.23.2.3 -> r1.23.2.4)

Index: pgConn.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgConn.h,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -Lsrc/include/pgConn.h -Lsrc/include/pgConn.h -u -w -r1.27.2.1 -r1.27.2.2
--- src/include/pgConn.h
+++ src/include/pgConn.h
@@ -97,6 +97,7 @@
     wxString dbHost;
     OID lastSystemOID;
     OID dbOid;
+	wxString reservedNamespaces;
 
     void *noticeArg;
     PQnoticeProcessor noticeProc;
Index: pgDomain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgDomain.cpp,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -Lsrc/schema/pgDomain.cpp -Lsrc/schema/pgDomain.cpp -u -w -r1.23.2.3 -r1.23.2.4
--- src/schema/pgDomain.cpp
+++ src/schema/pgDomain.cpp
@@ -149,8 +149,8 @@
 
             domain->iSetOid(domains->GetOid(wxT("oid")));
             domain->iSetOwner(domains->GetVal(wxT("domainowner")));
-            domain->iSetBasetype(domains->GetOid(wxT("basetype")));
-            domain->iSetBasetypeOid(domains->GetBool(wxT("typbasetype")));
+            domain->iSetBasetype(domains->GetVal(wxT("basetype")));
+            domain->iSetBasetypeOid(domains->GetOid(wxT("typbasetype")));
             domain->iSetComment(domains->GetVal(wxT("description")));
             long typmod=domains->GetLong(wxT("typtypmod"));