Merge branch 'master' into chaz

[chaz/openbox] / openbox / startupnotify.h

diff --git a/openbox/startupnotify.h b/openbox/startupnotify.h
index 82b87a58c11c02549aadeeebbb9c55638b6445db..d524bcaa2b8c3c1361ca2ed9013b32bac28f165c 100644 (file)
--- a/openbox/startupnotify.h
+++ b/openbox/startupnotify.h
@@ -25,23 +25,26 @@
 void sn_startup(gboolean reconfig);
 void sn_shutdown(gboolean reconfig);
 
-gboolean sn_app_starting();
+gboolean sn_app_starting(void);
 
-/*! Notify that an app has started */
-Time sn_app_started(const gchar *id, const gchar *wmclass);
+/*! Notify that an app has started
+  @param wmclass the WM_CLASS[1] hint
+  @param name the WM_CLASS[0] hint
+ */
+Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name);
 
 /*! Get the desktop requested via the startup-notiication protocol if one
   was requested */
 gboolean sn_get_desktop(gchar *id, guint *desktop);
 
 /* Get the environment to run the program in, with startup notification */
-void sn_setup_spawn_environment(gchar *program, gchar *name,
-                                gchar *icon_name, gint desktop,
-                                Time time);
+void sn_setup_spawn_environment(const gchar *program, const gchar *name,
+                                const gchar *icon_name, const gchar *wmclass,
+                                gint desktop);
 
 /* Tell startup notification we're not actually running the program we
    told it we were
 */
-void sn_spawn_cancel();
+void sn_spawn_cancel(void);
 
 #endif