[glom] Cleanup.

[Murray Cumming <murrayc src gnome org>]

commit 7ec01b3ae3c91f11992311e98842ba34396c5156
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 25 18:30:44 2009 +0200

    Cleanup.
    
    * glom/glom.glade: Really revert a bad merge from the maemo5 branch.
    * glom/libglom/connectionpool_backends/postgres_self.cc: Do not have
    actual newlines in string literals.

 ChangeLog                                          |    8 +++
 glom/glom.glade                                    |    2 +-
 .../connectionpool_backends/postgres_self.cc       |   58 ++++++++++----------
 3 files changed, 38 insertions(+), 30 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8d8b152..3f075b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-25  Murray Cumming  <murrayc murrayc-desktop>
+
+	Cleanup.
+
+	* glom/glom.glade: Really revert a bad merge from the maemo5 branch.
+	* glom/libglom/connectionpool_backends/postgres_self.cc: Do not have 
+	actual newlines in string literals.
+
 2009-09-25  Murray Cumming  <murrayc murrayc com>
 
 	Fix the build with gtkmm < 2.18.
diff --git a/glom/glom.glade b/glom/glom.glade
index efc79d0..5bf52b1 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -947,7 +947,7 @@
       </object>
     </child>
   </object>
-  <object class="HildonWindow" id="window_main">
+  <object class="GtkWindow" id="window_main">
     <property name="title" translatable="yes">Glom</property>
     <property name="default_width">900</property>
     <property name="default_height">700</property>
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 490944e..b22a601 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -73,39 +73,39 @@ namespace ConnectionPoolBackends
 // incompatibly: http://www.postgresql.org/about/press/features84#security
  
 #define DEFAULT_CONFIG_PG_HBA_LOCAL_8p3 \
-"# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD\n\
-\n\
-# local is for Unix domain socket connections only\n\
-# trust allows connection from the current PC without a password:\n\
-local   all         all                               trust\n\
-local   all         all                               ident sameuser\n\
-local   all         all                               md5\n\
-\n\
-# TCP connections from the same computer, with a password:\n\
-host    all         all         127.0.0.1    255.255.255.255    md5\n\
-# IPv6 local connections:\n\
-host    all         all         ::1/128               md5\n"
+"# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD\n" \
+"\n" \
+"# local is for Unix domain socket connections only\n" \
+"# trust allows connection from the current PC without a password:\n" \
+"local   all         all                               trust\n" \
+"local   all         all                               ident sameuser\n" \
+"local   all         all                               md5\n" \
+"\n" \
+"# TCP connections from the same computer, with a password:\n" \
+"host    all         all         127.0.0.1    255.255.255.255    md5\n" \
+"# IPv6 local connections:\n" \
+"host    all         all         ::1/128               md5\n"
 
 #define DEFAULT_CONFIG_PG_HBA_LOCAL_8p4 \
-"# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD\n\
-\n\
-# local is for Unix domain socket connections only\n\
-# trust allows connection from the current PC without a password:\n\
-local   all         all                               trust\n\
-local   all         all                               ident\n\
-local   all         all                               md5\n\
-\n\
-# TCP connections from the same computer, with a password:\n\
-host    all         all         127.0.0.1    255.255.255.255    md5\n\
-# IPv6 local connections:\n\
-host    all         all         ::1/128               md5\n"
+"# TYPE  DATABASE    USER        CIDR-ADDRESS          METHOD\n" \
+"\n" \
+"# local is for Unix domain socket connections only\n" \
+"# trust allows connection from the current PC without a password:\n" \
+"local   all         all                               trust\n" \
+"local   all         all                               ident\n" \
+"local   all         all                               md5\n" \
+"\n" \
+"# TCP connections from the same computer, with a password:\n" \
+"host    all         all         127.0.0.1    255.255.255.255    md5\n" \
+"# IPv6 local connections:\n" \
+"host    all         all         ::1/128               md5\n"
 
 #define DEFAULT_CONFIG_PG_HBA_REMOTE_EXTRA \
-"\n\
-# IPv4 local connections:\n\
-host    all         all         0.0.0.0/0          md5\n\
-# IPv6 local connections:\n\
-host    all         all         ::1/128               md5\n"
+"\n" \
+"# IPv4 local connections:\n" \
+"host    all         all         0.0.0.0/0          md5\n" \
+"# IPv6 local connections:\n" \
+"host    all         all         ::1/128               md5\n"
 
 #define PORT_POSTGRESQL_SELF_HOSTED_START 5433
 #define PORT_POSTGRESQL_SELF_HOSTED_END 5500