Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

1 files changed, 11 insertions, 25 deletions

diff --git a/cpp/demo/Ice/hello/Client.cpp b/cpp/demo/Ice/hello/Client.cpp
index 10afd89365d..a9bfb0330a9 100644
--- a/cpp/demo/Ice/hello/Client.cpp
+++ b/cpp/demo/Ice/hello/Client.cpp
@@ -17,8 +17,9 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -32,6 +33,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -41,12 +51,6 @@ HelloClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
     HelloPrx twoway = HelloPrx::checkedCast(
         communicator()->propertyToProxy("Hello.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
@@ -202,24 +206,6 @@ HelloClient::run(int argc, char* argv[])
 }
 
 void
-HelloClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 HelloClient::menu()
 {
     cout <<