diff options
Diffstat (limited to 'openbox/ping.c')
| -rw-r--r-- | openbox/ping.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/openbox/ping.c b/openbox/ping.c index 748c0c82..83202493 100644 --- a/openbox/ping.c +++ b/openbox/ping.c @@ -19,11 +19,11 @@ #include "ping.h" #include "client.h" -#include "prop.h" #include "event.h" #include "debug.h" -#include "mainloop.h" #include "openbox.h" +#include "obt/mainloop.h" +#include "obt/prop.h" typedef struct _ObPingTarget { @@ -79,8 +79,8 @@ void ping_start(struct _ObClient *client, ObPingEventHandler h) t->client = client; t->h = h; - ob_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout, - t, g_direct_equal, NULL); + obt_main_loop_timeout_add(ob_main_loop, PING_TIMEOUT, ping_timeout, + t, g_direct_equal, NULL); /* act like we just timed out immediately, to start the pinging process now instead of after the first delay. this makes sure the client ends up in the ping_ids hash table now. */ @@ -95,7 +95,7 @@ void ping_got_pong(guint32 id) ObPingTarget *t; if ((t = g_hash_table_lookup(ping_ids, &id))) { - /*ob_debug("-PONG: '%s' (id %u)\n", t->client->title, t->id);*/ + /*ob_debug("-PONG: '%s' (id %u)", t->client->title, t->id);*/ if (t->waiting > PING_TIMEOUT_WARN) { /* we had notified that they weren't responding, so now we need to notify that they are again */ @@ -107,7 +107,7 @@ void ping_got_pong(guint32 id) ping_end(t->client, NULL); } else - ob_debug("Got PONG with id %u but not waiting for one\n", id); + ob_debug("Got PONG with id %u but not waiting for one", id); } static gboolean find_client(gpointer key, gpointer value, gpointer client) @@ -130,10 +130,10 @@ static void ping_send(ObPingTarget *t) g_hash_table_insert(ping_ids, &t->id, t); } - /*ob_debug("+PING: '%s' (id %u)\n", t->client->title, t->id);*/ - PROP_MSG_TO(t->client->window, t->client->window, wm_protocols, - prop_atoms.net_wm_ping, t->id, t->client->window, 0, 0, - NoEventMask); + /*ob_debug("+PING: '%s' (id %u)", t->client->title, t->id);*/ + OBT_PROP_MSG_TO(t->client->window, t->client->window, WM_PROTOCOLS, + OBT_PROP_ATOM(NET_WM_PING), t->id, t->client->window, 0, 0, + NoEventMask); } static gboolean ping_timeout(gpointer data) @@ -158,7 +158,8 @@ static void ping_end(ObClient *client, gpointer data) if ((t = g_hash_table_find(ping_ids, find_client, client))) { g_hash_table_remove(ping_ids, &t->id); - ob_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, t, FALSE); + obt_main_loop_timeout_remove_data(ob_main_loop, ping_timeout, + t, FALSE); g_free(t); } |