From 0c48d768c68170bfc2408fe7cc98438048ea7fe6 Mon Sep 17 00:00:00 2001 From: unexist Date: Sun, 7 Aug 2011 16:13:04 +0200 Subject: [PATCH] Replaced SUBTLE_TRAY_KILL with _NET_CLOSE_WINDOW --- src/subtle/ewmh.c | 3 +-- src/subtlext/tag.c | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/subtle/ewmh.c b/src/subtle/ewmh.c index 9de3dcce..ef1cfd56 100644 --- a/src/subtle/ewmh.c +++ b/src/subtle/ewmh.c @@ -73,8 +73,7 @@ subEwmhInit(void) "SUBTLE_CLIENT_TAGS", "SUBTLE_CLIENT_RETAG", "SUBTLE_CLIENT_GRAVITY", "SUBTLE_CLIENT_SCREEN", "SUBTLE_CLIENT_FLAGS", "SUBTLE_GRAVITY_NEW", "SUBTLE_GRAVITY_LIST", "SUBTLE_GRAVITY_KILL", - "SUBTLE_TAG_NEW", "SUBTLE_TAG_LIST", "SUBTLE_TAG_KILL", - "SUBTLE_TRAY_LIST", "SUBTLE_TRAY_KILL", + "SUBTLE_TAG_NEW", "SUBTLE_TAG_LIST", "SUBTLE_TAG_KILL", "SUBTLE_TRAY_LIST", "SUBTLE_VIEW_NEW", "SUBTLE_VIEW_TAGS", "SUBTLE_VIEW_STYLE", "SUBTLE_VIEW_ICONS", "SUBTLE_VIEW_KILL", "SUBTLE_SUBLET_NEW", "SUBTLE_SUBLET_UPDATE", "SUBTLE_SUBLET_DATA", diff --git a/src/subtlext/tag.c b/src/subtlext/tag.c index e353bdf4..cd903282 100644 --- a/src/subtlext/tag.c +++ b/src/subtlext/tag.c @@ -308,17 +308,16 @@ subTagClients(VALUE self) for(i = 0; i < nclients; i++) { if((tags = (unsigned long *)subSharedPropertyGet(display, - clients[i], XA_CARDINAL, XInternAtom(display, "SUBTLE_CLIENT_TAGS", - False), NULL))) + clients[i], XA_CARDINAL, XInternAtom(display, + "SUBTLE_CLIENT_TAGS", False), NULL))) { /* Check if tag id matches */ if(*tags & (1L << (FIX2INT(id) + 1))) { /* Create new client */ - if(!NIL_P(c = rb_funcall(klass, meth, 1, INT2FIX(i)))) + if(!NIL_P(c = rb_funcall(klass, meth, 1, + LONG2NUM(clients[i])))) { - rb_iv_set(c, "@win", LONG2NUM(clients[i])); - subClientUpdate(c); rb_ary_push(array, c);