1 files changed, 12 insertions, 27 deletions
diff --git a/cpp/demo/Ice/callback/Client.cpp b/cpp/demo/Ice/callback/Client.cpp
index 427d6fb291d..bcc4c6f88ca 100644
--- a/cpp/demo/Ice/callback/Client.cpp
+++ b/cpp/demo/Ice/callback/Client.cpp
@@ -37,8 +37,9 @@ class CallbackClient : public Ice::Application
 {
 public:
 
+    CallbackClient();
+
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -52,6 +53,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+CallbackClient::CallbackClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 CallbackClient::run(int argc, char* argv[])
 {
@@ -61,15 +71,8 @@ CallbackClient::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();
-
     CallbackSenderPrx twoway = CallbackSenderPrx::checkedCast(
-        communicator()->propertyToProxy("Callback.CallbackServer")->
-            ice_twoway()->ice_timeout(-1)->ice_secure(false));
+        communicator()->propertyToProxy("CallbackSender.Proxy")->ice_twoway()->ice_timeout(-1)->ice_secure(false));
     if(!twoway)
     {
         cerr << appName() << ": invalid proxy" << endl;
@@ -192,24 +195,6 @@ CallbackClient::run(int argc, char* argv[])
 }
 
 void
-CallbackClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 CallbackClient::menu()
 {
     cout <<