@@ -173,6 +173,7 @@ openbox/actions/maximizevertical.c \
 	openbox/actions/move.c \
 	openbox/actions/moverelative.c \
 	openbox/actions/moveto.c \
+	openbox/actions/omnipresent.c \
 	openbox/actions/raise.c \
 	openbox/actions/raiselower.c \
 	openbox/actions/reconfigure.c \

@@ -465,11 +465,6 @@ action_unshaderaise,
         setup_client_action
     },
     {
-        "toggleomnipresent",
-        action_toggle_omnipresent,
-        setup_client_action
-    },
-    {
         "resizerelativevert",
         action_resize_relative_vert,
         setup_client_action
@@ -918,13 +913,6 @@ if (data->client.any.c->shaded)
         action_lower(data);
     else
         action_shade(data);
-}
-
-void action_toggle_omnipresent(union ActionData *data)
-{ 
-    client_set_desktop(data->client.any.c,
-                       data->client.any.c->desktop == DESKTOP_ALL ?
-                       screen_desktop : DESKTOP_ALL, FALSE, TRUE);
 }
 
 void action_resize_relative_horz(union ActionData *data)

@@ -27,4 +27,5 @@ action_moveto_startup();
     action_moverelative_startup();
     action_shade_startup();
     action_kill_startup();
+    action_omnipresent_startup();
 }

@@ -28,5 +28,6 @@ void action_moveto_startup();
 void action_moverelative_startup();
 void action_shade_startup();
 void action_kill_startup();
+void action_omnipresent_startup();
 
 #endif

@@ -0,0 +1,62 @@ 
+#include "openbox/actions.h"
+#include "openbox/client.h"
+#include "openbox/screen.h"
+
+typedef struct {
+    gboolean toggle;
+    gboolean on;
+} Options;
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static void     free_func(gpointer options);
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_omnipresent_startup()
+{
+    actions_register("omnipresent",
+                     setup_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+}
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->toggle = TRUE;
+
+    if ((n = parse_find_node("omnipresent", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "toggle")) {
+            o->toggle = FALSE;
+            o->on = parse_bool(doc, n);
+        }
+        g_free(s);
+    }
+
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (data->client)
+        if (o->toggle || (o->on != (data->client->desktop == DESKTOP_ALL)))
+            client_set_desktop(data->client,
+                               data->client->desktop == DESKTOP_ALL ?
+                               screen_desktop : DESKTOP_ALL, FALSE, TRUE);
+
+    return FALSE;
+}