Squashed commit of the following:

commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:22:52 2008 +0800

    Cleanup some IceGrid configuration files.

commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:17:10 2008 +0800

    remove ttl setting.

commit c418b308ff7cc8e8a4296819938b88dfedc16a97
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:16:32 2008 +0800

    remove useless PopulateEmptyIndices config.

commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 13:59:51 2008 +0800

    - Removed interrupt handlers for interactive C++ demos.
    - Lots of cleanups to demos.

1 files changed, 10 insertions, 25 deletions

diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp
index 4c7e4d00ada..2595c52b399 100755
--- a/cpp/demo/Glacier2/chat/Client.cpp
+++ b/cpp/demo/Glacier2/chat/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <Glacier2/Router.h>
+#include <Glacier2/Glacier2.h>
 #include <Chat.h>
 
 using namespace std;
@@ -91,6 +91,15 @@ class ChatClient : public Ice::Application
 {
 public:
 
+    ChatClient() :
+        //
+        // Since this is an interactive demo we don't want any signal
+        // handling.
+        //
+        Application(Ice::NoSignalHandling)
+    {
+    }
+
     virtual int
     run(int argc, char* argv[])
     {
@@ -100,12 +109,6 @@ public:
             return EXIT_FAILURE;
         }
 
-        //
-        // Since this is an interactive demo we want the custom interrupt
-        // callback to be called when the process is interrupted.
-        //
-        callbackOnInterrupt();
-
         {
             IceUtil::Mutex::Lock sync(_mutex);
             Ice::RouterPrx defaultRouter = communicator()->getDefaultRouter();
@@ -206,24 +209,6 @@ public:
         return EXIT_SUCCESS;
     }
 
-    virtual void
-    interruptCallback(int)
-    {
-        try
-        {
-            communicator()->destroy();
-        }
-        catch(const IceUtil::Exception& ex)
-        {
-            cerr << appName() << ": " << ex << endl;
-        }
-        catch(...)
-        {
-            cerr << appName() << ": unknown exception" << endl;
-        }
-        exit(EXIT_SUCCESS);
-    }
-
 private:
 
     void