drop the startup notify timeout from 30 to 20 seconds

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 85d84798ab991e3eb433afbc01f8887d92671d92..faf065a12fedd0bf10057a27b7f14a2a43ff0efa 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1587,7 +1587,7 @@ void action_send_to_desktop(union ActionData *data)
     if (data->sendto.desk < screen_num_desktops ||
         data->sendto.desk == DESKTOP_ALL) {
         client_set_desktop(c, data->sendto.desk, data->sendto.follow);
-        if (data->sendto.follow)
+        if (data->sendto.follow && data->sendto.desk != screen_desktop)
             screen_set_desktop(data->sendto.desk, TRUE);
     }
 }
@@ -1621,7 +1621,8 @@ void action_desktop_dir(union ActionData *data)
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
-        if (d != screen_desktop) screen_set_desktop(d, TRUE);
+        if (d != screen_desktop)
+            screen_set_desktop(d, TRUE);
     }
 }