Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/src/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.92 -r1.93
--- src/Makefile.am
+++ src/Makefile.am
@@ -52,7 +52,7 @@
 ui/dlgHbaConfig.cpp ui/dlgMainConfig.cpp ui/frmUpdate.cpp \
 ui/frmConfig.cpp ui/frmHbaConfig.cpp ui/frmMainConfig.cpp \
 utils/sysLogger.cpp utils/sysSettings.cpp \
-utils/utffile.cpp \
+utils/utffile.cpp utils/pgconfig.cpp utils/update.cpp \
 ui/common/xrcDialogs.cpp
 
 noinst_HEADERS = include/copyright.h include/version.h include/ctlSQLBox.h \
Index: frmMainConfig.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmMainConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/frmMainConfig.h -Lsrc/include/frmMainConfig.h -u -w -r1.1 -r1.2
--- src/include/frmMainConfig.h
+++ src/include/frmMainConfig.h
@@ -12,7 +12,7 @@
 #ifndef FRMMAINCONFIG_H
 #define FRMMAINCONFIG_H
 
-#include "pgConfig.h"
+#include "pgconfig.h"
 #include "frmConfig.h"
 
 class ctlListView;
Index: pgconfig.h
===================================================================
RCS file: /projects/pgadmin3/src/include/pgconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/pgconfig.h -Lsrc/include/pgconfig.h -u -w -r1.1 -r1.2
--- src/include/pgconfig.h
+++ src/include/pgconfig.h
@@ -163,6 +163,7 @@
 public:
     virtual bool IsValid() = 0;
     virtual pgSettingItem *GetNextItem() = 0;
+    virtual ~pgSettingReader() {}
 };
 
 
Index: dlgMainConfig.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgMainConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/dlgMainConfig.h -Lsrc/include/dlgMainConfig.h -u -w -r1.1 -r1.2
--- src/include/dlgMainConfig.h
+++ src/include/dlgMainConfig.h
@@ -18,7 +18,7 @@
 // App headers
 #include "pgAdmin3.h"
 
-#include "pgConfig.h"
+#include "pgconfig.h"
 
 // Class declarations
 class dlgMainConfig : public DialogWithHelp
Index: dlgHbaConfig.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgHbaConfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/dlgHbaConfig.h -Lsrc/include/dlgHbaConfig.h -u -w -r1.1 -r1.2
--- src/include/dlgHbaConfig.h
+++ src/include/dlgHbaConfig.h
@@ -18,7 +18,7 @@
 // App headers
 #include "pgAdmin3.h"
 
-#include "pgConfig.h"
+#include "pgconfig.h"
 
 // Class declarations
 class dlgHbaConfig : public DialogWithHelp
Index: frmHbaConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmHbaConfig.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/frmHbaConfig.cpp -Lsrc/ui/frmHbaConfig.cpp -u -w -r1.1 -r1.2
--- src/ui/frmHbaConfig.cpp
+++ src/ui/frmHbaConfig.cpp
@@ -27,7 +27,6 @@
 #include "pgSet.h"
 #include "menu.h"
 #include "pgfeatures.h"
-#include "pgConfig.h"
 
 #define CTL_CFGVIEW 345
 
@@ -62,7 +61,7 @@
 
         wxString txt;
         txt.Printf(_(" - %s on %s (%s:%d)"),
-                serverFileName, server->GetDescription().c_str(), 
+                serverFileName.c_str(), server->GetDescription().c_str(), 
                 server->GetName().c_str(), server->GetPort());
         SetTitle(BACE_TITLE + txt);
 
Index: dlgMainConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgMainConfig.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/dlgMainConfig.cpp -Lsrc/ui/dlgMainConfig.cpp -u -w -r1.1 -r1.2
--- src/ui/dlgMainConfig.cpp
+++ src/ui/dlgMainConfig.cpp
@@ -15,7 +15,6 @@
 #include "pgAdmin3.h"
 
 #include "dlgMainConfig.h"
-#include "pgConfig.h"
 
 
 // Icons
Index: frmMainConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMainConfig.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/frmMainConfig.cpp -Lsrc/ui/frmMainConfig.cpp -u -w -r1.1 -r1.2
--- src/ui/frmMainConfig.cpp
+++ src/ui/frmMainConfig.cpp
@@ -63,7 +63,7 @@
 
         wxString txt;
         txt.Printf(_(" - %s on %s (%s:%d)"),
-                serverFileName, server->GetDescription().c_str(), 
+                serverFileName.c_str(), server->GetDescription().c_str(), 
                 server->GetName().c_str(), server->GetPort());
         SetTitle(BCE_TITLE + txt);
 
Index: dlgHbaConfig.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgHbaConfig.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/dlgHbaConfig.cpp -Lsrc/ui/dlgHbaConfig.cpp -u -w -r1.1 -r1.2
--- src/ui/dlgHbaConfig.cpp
+++ src/ui/dlgHbaConfig.cpp
@@ -15,7 +15,6 @@
 #include "pgAdmin3.h"
 
 #include "dlgHbaConfig.h"
-#include "pgConfig.h"
 #include "pgConn.h"
 #include "pgSet.h"