Index: postgres.h
===================================================================
RCS file: /projects/pgadmin3/src/include/postgres.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/include/postgres.h -Lsrc/include/postgres.h -u -w -r1.4 -r1.5
--- src/include/postgres.h
+++ src/include/postgres.h
@@ -19,7 +19,7 @@
 
 // to suppress much stuff in parse.h
 #define YYTOKENTYPE
-#define YYSTYPE
+#define YYSTYPE int
 
 
 #define NAMEDATALEN 32
\ No newline at end of file
Index: dlgRepCluster.cpp
===================================================================
RCS file: /projects/pgadmin3/src/slony/dlgRepCluster.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/slony/dlgRepCluster.cpp -Lsrc/slony/dlgRepCluster.cpp -u -w -r1.4 -r1.5
--- src/slony/dlgRepCluster.cpp
+++ src/slony/dlgRepCluster.cpp
@@ -94,6 +94,8 @@
 
             serverItem = mainForm->GetBrowser()->GetNextChild(servers, cookie);
         }
+        if (cbServer->GetCount())
+            cbServer->SetSelection(0);
     }
     return dlgProperty::Go(modal);
 }
@@ -791,7 +793,6 @@
 #define txtVersion          CTRL_TEXT("txtVersion")
 
 BEGIN_EVENT_TABLE(dlgRepClusterUpgrade, dlgRepClusterBase)
-    EVT_COMBOBOX(XRCID("cbDatabase"),       dlgRepClusterUpgrade::OnChangeDatabase)
 END_EVENT_TABLE();
 
 
@@ -817,7 +818,7 @@
     CheckValid(enable, cbDatabase->GetCount() > 0, _("Select server with Slony-I cluster installed."));
     CheckValid(enable, cbClusterName->GetCount() > 0, _("Select database with Slony-I cluster installed."));
     CheckValid(enable, cbClusterName->GetSelection() >= 0, _("Select Slony-I cluster."));
-    CheckValid(enable, version >= cluster->GetClusterVersion(), _("Selected cluster doesn't contain newer software."));
+    CheckValid(enable, version > cluster->GetClusterVersion(), _("Selected cluster doesn't contain newer software."));
     EnableOK(enable);
 }
 
Index: dlgDatabase.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgDatabase.xrc,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/ui/common/dlgDatabase.xrc -Lsrc/ui/common/dlgDatabase.xrc -u -w -r1.19 -r1.20
--- src/ui/common/dlgDatabase.xrc
+++ src/ui/common/dlgDatabase.xrc
@@ -72,7 +72,7 @@
             <pos>5,97d</pos>
           </object>
           <object class="wxTextCtrl" name="txtComment">
-            <pos>70,95d</pos>
+            <pos>70,195d</pos>
             <size>135,95d</size>
             <style>wxTE_MULTILINE</style>
           </object>
Index: misc.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/misc.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -Lsrc/utils/misc.cpp -Lsrc/utils/misc.cpp -u -w -r1.66 -r1.67
--- src/utils/misc.cpp
+++ src/utils/misc.cpp
@@ -195,7 +195,7 @@
 wxString IdAndName(long id, const wxString &name)
 {
     wxString str;
-    str.Printf(wxT("%d - %s"), id, name.BeforeFirst('\n'));
+    str.Printf(wxT("%d - %s"), id, name.BeforeFirst('\n').c_str());
     return str;
 }