Merge branch 'master' into chaz

[chaz/openbox] / openbox / ping.h

diff --git a/openbox/ping.h b/openbox/ping.h
index 0b6dfeadbf51b978dd0e6c45abae1ef0d0a63868..ceb0bdb0d269697d25968bd8cfa94b85e9ccb7c6 100644 (file)
--- a/openbox/ping.h
+++ b/openbox/ping.h
@@ -33,9 +33,11 @@ struct _ObClient;
 */
 typedef void (*ObPingEventHandler) (struct _ObClient *c, gboolean dead);
 
+void ping_startup(gboolean reconfigure);
+void ping_shutdown(gboolean reconfigure);
+
 void ping_start(struct _ObClient *c, ObPingEventHandler h);
-void ping_stop(struct _ObClient *c);
 
-void ping_got_pong(Time timestamp);
+void ping_got_pong(guint32 id);
 
 #endif