use otk::Property properly, and the right atoms

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index d1ae736959e4a3507c0ecba69c43df290ef9167c..5b1225f758127ef872bfe5bdb975a76f0901b5cb 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -21,13 +21,10 @@ AppWidget::AppWidget(Application *app, Direction direction,
 {
   assert(app);
 
-  _wm_protocols = Property::atoms.wm_protocols;
-  _wm_delete = Property::atoms.wm_protocols;
-
   // set WM Protocols on the window
   Atom protocols[2];
-  protocols[0] = _wm_protocols;
-  protocols[1] = _wm_delete;
+  protocols[0] = Property::atoms.wm_protocols;
+  protocols[1] = Property::atoms.wm_delete_window;
   XSetWMProtocols(**display, window(), protocols, 2);
 }
 
@@ -52,8 +49,8 @@ void AppWidget::hide(void)
 void AppWidget::clientMessageHandler(const XClientMessageEvent &e)
 {
   EventHandler::clientMessageHandler(e);
-  if (e.message_type == _wm_protocols &&
-      static_cast<Atom>(e.data.l[0]) == _wm_delete)
+  if (e.message_type == Property::atoms.wm_protocols &&
+      static_cast<Atom>(e.data.l[0]) == Property::atoms.wm_delete_window)
     hide();
 }
 

diff --git a/otk/appwidget.hh b/otk/appwidget.hh
index 7a5cf74ded68b457a2eed1274356ca58e1e10a20..69cca58938d50628801b54d6cc9f14f6588d3683 100644 (file)
--- a/otk/appwidget.hh
+++ b/otk/appwidget.hh
@@ -23,8 +23,6 @@ public:
 private:
 
   Application *_application;
-  Atom _wm_protocols;
-  Atom _wm_delete;
 };
 
 }