1 files changed, 16 insertions, 30 deletions
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index ac910630af7..f8b3b52e059 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -18,8 +18,8 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -33,15 +33,13 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
-void
-HelloClient::menu()
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
 {
-    cout <<
-        "usage:\n"
-        "t: send greeting\n"
-        "s: shutdown server\n"
-        "x: exit\n"
-        "?: help\n";
 }
 
 int
@@ -54,12 +52,6 @@ HelloClient::run(int argc, char* argv[])
     }
 
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    //
     // First we try to connect to the object with the `hello'
     // identity. If it's not registered with the registry, we 
     // search for an object with the ::Demo::Hello type.
@@ -122,19 +114,13 @@ HelloClient::run(int argc, char* argv[])
 }
 
 void
-HelloClient::interruptCallback(int)
+HelloClient::menu()
 {
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
+    cout <<
+        "usage:\n"
+        "t: send greeting\n"
+        "s: shutdown server\n"
+        "x: exit\n"
+        "?: help\n";
 }
+