Log Message:
-----------
Fix remembering SSL connection parameter

Modified Files:
--------------
    pgadmin3:
        CHANGELOG.txt (r1.162 -> r1.163)
        configure.ac (r1.28 -> r1.29)
    pgadmin3/src/include:
        version.h (r1.15 -> r1.16)
    pgadmin3/src/ui:
        dlgDatabase.cpp (r1.37 -> r1.38)
        dlgSchema.cpp (r1.16 -> r1.17)
        dlgTablespace.cpp (r1.5 -> r1.6)
        dlgType.cpp (r1.29 -> r1.30)
        frmMain.cpp (r1.111 -> r1.112)

Index: configure.ac
===================================================================
RCS file: /projects/pgadmin3/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.28 -r1.29
--- configure.ac
+++ configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ(2.57)
 AC_REVISION($Revision$)
 AC_COPYRIGHT(Copyright 2002 - 2004 The pgAdmin Development Team)
-AC_INIT(pgadmin3, 1.2.0-rc1, [EMAIL PROTECTED])
+AC_INIT(pgadmin3, 1.2.0-post-rc1, [EMAIL PROTECTED])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([src/pgAdmin3.cpp])
 AM_CONFIG_HEADER([config.h])
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.162
retrieving revision 1.163
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.162 -r1.163
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-11-09 AP 1.2RC2 Fix remembering SSL connection parameter (r: 
Justin Clift)
     <li>2004-11-09 AP 1.2RC2 Fix GTK comboboxes (r: Tim Booth)
     <li>2004-11-05 AP 1.2RC2 Disable changing parameters of connected servers
     <li>2004-11-04 AP 1.2RC2 Fix duplicate functions in Cast dialog (r: 
Alexander Borkowski)
Index: version.h
===================================================================
RCS file: /projects/pgadmin3/src/include/version.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/include/version.h -Lsrc/include/version.h -u -w -r1.15 -r1.16
--- src/include/version.h
+++ src/include/version.h
@@ -11,9 +11,9 @@
 
 
 // Application Versions
-#define VERSION_STR     wxT("1.2.0 RC1")
+#define VERSION_STR     wxT("1.2.0 post-RC1")
 #define VERSION_NUM     1,2,0,99
-#define VERSION_PACKAGE 1.2.0-rc1
+#define VERSION_PACKAGE 1.2.0-post-rc1
 
 #define PRERELEASE 1
 // #define BUILD "..."
Index: dlgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDatabase.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -Lsrc/ui/dlgDatabase.cpp -Lsrc/ui/dlgDatabase.cpp -u -w -r1.37 -r1.38
--- src/ui/dlgDatabase.cpp
+++ src/ui/dlgDatabase.cpp
@@ -304,7 +304,7 @@
         // edit mode
 
         AppendNameChange(sql);
-        AppendOwnerChange(sql);
+        AppendOwnerChange(sql, wxT("DATABASE ") + qtIdent(name));
 
         wxArrayString vars;
 
Index: dlgTablespace.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgTablespace.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/dlgTablespace.cpp -Lsrc/ui/dlgTablespace.cpp -u -w -r1.5 -r1.6
--- src/ui/dlgTablespace.cpp
+++ src/ui/dlgTablespace.cpp
@@ -114,7 +114,7 @@
         // Edit Mode
 
         AppendNameChange(sql);
-        AppendOwnerChange(sql);
+        AppendOwnerChange(sql, wxT("TABLESPACE ") + qtIdent(name));
     }
     else
     {
Index: dlgSchema.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgSchema.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/ui/dlgSchema.cpp -Lsrc/ui/dlgSchema.cpp -u -w -r1.16 -r1.17
--- src/ui/dlgSchema.cpp
+++ src/ui/dlgSchema.cpp
@@ -110,7 +110,7 @@
     {
         // edit mode
         AppendNameChange(sql);
-        AppendOwnerChange(sql);
+        AppendOwnerChange(sql, wxT("SCHEMA ") + qtIdent(name));
     }
     else
     {
Index: dlgType.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgType.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lsrc/ui/dlgType.cpp -Lsrc/ui/dlgType.cpp -u -w -r1.29 -r1.30
--- src/ui/dlgType.cpp
+++ src/ui/dlgType.cpp
@@ -323,7 +323,7 @@
     if (type)
     {
         // Edit Mode
-        AppendOwnerChange(sql);
+        AppendOwnerChange(sql, wxT("TYPE ") + type->GetQuotedFullIdentifier());
     }
     else
     {
Index: frmMain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMain.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -Lsrc/ui/frmMain.cpp -Lsrc/ui/frmMain.cpp -u -w -r1.111 -r1.112
--- src/ui/frmMain.cpp
+++ src/ui/frmMain.cpp
@@ -790,7 +790,7 @@
                
                        // SSL
                        key.Printf(wxT("Servers/SSL%d"), numServers);
-
+                       settings->Write(key, server->GetSSL());
                }
 
         // Get the next item
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
      joining column's datatypes do not match

Reply via email to