From 04619df8187599caee436319305a2dfa27764939 Mon Sep 17 00:00:00 2001
From: Tomas Frydrych <tf@o-hand.com>
Date: Tue, 25 Nov 2008 15:34:07 +0000
Subject: [PATCH] Added timestamp parameter to
 meta_window_change_workspace_by_index().

---
 src/core/window.c    | 6 ++++--
 src/include/window.h | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c
index 8814cacab..1552904fb 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4782,7 +4782,8 @@ meta_window_property_notify (MetaWindow *window,
 void
 meta_window_change_workspace_by_index (MetaWindow *window,
                                        gint        space_index,
-                                       gboolean    append)
+                                       gboolean    append,
+                                       guint32     timestamp)
 {
   MetaWorkspace *workspace;
   MetaScreen    *screen;
@@ -4800,7 +4801,8 @@ meta_window_change_workspace_by_index (MetaWindow *window,
 
   if (!workspace && append)
     {
-      guint32 timestamp = meta_display_get_current_time (window->display);
+      if (timestamp == CurrentTime)
+        timestamp = meta_display_get_current_time_roundtrip (window->display);
       workspace = meta_screen_append_new_workspace (screen, FALSE, timestamp);
     }
 
diff --git a/src/include/window.h b/src/include/window.h
index 4a66b3e5e..5bd0b35ec 100644
--- a/src/include/window.h
+++ b/src/include/window.h
@@ -70,5 +70,6 @@ gboolean    meta_window_showing_on_its_workspace (MetaWindow *window);
 const char* meta_window_get_startup_id (MetaWindow *window);
 void meta_window_change_workspace_by_index (MetaWindow *window,
                                             gint        space_index,
-                                            gboolean    append);
+                                            gboolean    append,
+                                            guint32     timestamp);
 #endif