Index: TODO.txt
===================================================================
RCS file: /projects/pgadmin3/TODO.txt,v
retrieving revision 1.103
retrieving revision 1.104
diff -LTODO.txt -LTODO.txt -u -w -r1.103 -r1.104
--- TODO.txt
+++ TODO.txt
@@ -1,7 +1,6 @@
 <ul>
 	<li>Essentials
  	<ul>
-		<li>catch SIGPIPE
 		<li>recreate views after column type change
 		<li>pgDatatype to encapsulate all typmod handling, rewrite all other classes to use it
 		<li>Improve database connection docs for newbies.
Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.98 -r1.99
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -27,6 +27,11 @@
   #include <winsock.h>
 #endif
 
+// Linux headers
+#ifdef __LINUX__
+#include <signal.h>
+#endif
+
 #if wxCHECK_VERSION(2,5,1)
 #ifdef __WXGTK__
   #include <wx/renderer.h>
@@ -183,6 +188,10 @@
 #endif
 #endif
 
+#ifdef __LINUX__
+	signal(SIGPIPE, SIG_IGN);
+#endif
+
     locale = new wxLocale();
     locale->AddCatalogLookupPathPrefix(uiPath);