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, 11 insertions, 30 deletions

diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 2acbe14dc81..8f46ce1f935 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -18,13 +18,8 @@ class PhoneBookCollocated : public Ice::Application
 {
 public:
     
-    PhoneBookCollocated(const string& envName) :
-        _envName(envName)
-    {
-    }
-
+    PhoneBookCollocated(const string&);
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -38,15 +33,19 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.collocated");
 }
 
-int
-PhoneBookCollocated::run(int argc, char* argv[])
-{
+PhoneBookCollocated::PhoneBookCollocated(const string& envName) :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
+    Application(Ice::NoSignalHandling),
+    _envName(envName)
+{
+}
 
+int
+PhoneBookCollocated::run(int argc, char* argv[])
+{
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     //
@@ -107,21 +106,3 @@ PhoneBookCollocated::run(int argc, char* argv[])
 
     return status;
 }
-
-void
-PhoneBookCollocated::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}