Merge branch 'backport' into work

[chaz/openbox] / openbox / client.h

diff --git a/openbox/client.h b/openbox/client.h
index ca9927467074905901868e868ec9c4c8884ed782..30cab17b31f70988981f413805760814d98ca5a8 100644 (file)
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -573,14 +573,14 @@ gboolean client_focus(ObClient *self);
 
 /*! Activates the client for use, focusing, uniconifying it, etc. To be used
   when the user deliberately selects a window for use.
-  @param here If true, then the client is brought to the current desktop;
-              otherwise, the desktop is changed to where the client lives.
+  @param desktop If true, and the window is on another desktop, it will still
+                 be activated.
   @param raise If true, the client is brought to the front.
   @param unshade If true, the client is unshaded (if it is shaded)
   @param user If true, then a user action is what requested the activation;
               otherwise, it means an application requested it on its own
 */
-void client_activate(ObClient *self, gboolean here, gboolean raise,
+void client_activate(ObClient *self, gboolean desktop, gboolean raise,
                      gboolean unshade, gboolean user);
 
 /*! Bring all of its helper windows to its desktop. These are the utility and