From bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 Mon Sep 17 00:00:00 2001
From: Matthew Newhook <matthew@zeroc.com>
Date: Thu, 6 Mar 2008 14:26:07 +0800
Subject: 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.
---
 cpp/demo/Freeze/library/Client.cpp | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

(limited to 'cpp/demo/Freeze/library/Client.cpp')

diff --git a/cpp/demo/Freeze/library/Client.cpp b/cpp/demo/Freeze/library/Client.cpp
index 5b4345a2936..4e8b21772d5 100644
--- a/cpp/demo/Freeze/library/Client.cpp
+++ b/cpp/demo/Freeze/library/Client.cpp
@@ -14,8 +14,11 @@ using namespace std;
 
 class LibraryClient : public Ice::Application
 {
+public:
+
+    LibraryClient();
+
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -25,33 +28,18 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-int
-LibraryClient::run(int argc, char* argv[])
-{
+LibraryClient::LibraryClient() :
     //
-    // 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();
-
-    int runParser(int, char*[], const Ice::CommunicatorPtr&);
-    return runParser(argc, argv, communicator());
+    Application(Ice::NoSignalHandling)
+{
 }
 
-void
-LibraryClient::interruptCallback(int)
+int
+LibraryClient::run(int argc, char* argv[])
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    int runParser(int, char*[], const Ice::CommunicatorPtr&);
+    return runParser(argc, argv, communicator());
 }
-- 
cgit v1.2.3