From e2d2d159ca7df353ebfbf4145f554bdc62131741 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 26 Jul 2005 23:46:55 +0000 Subject: [PATCH] Revert part of patch from #166379; don't have gtk_window_present() change 2005-07-26 Elijah Newren Revert part of patch from #166379; don't have gtk_window_present() change a window's desktop, but rather leave it up to the WM. (#311653) * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a window's workspace --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkwindow.c | 3 --- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5403c10b90..9bebc09b51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-07-26 Elijah Newren + + Revert part of patch from #166379; don't have gtk_window_present() + change a window's desktop, but rather leave it up to the WM. + (#311653) + + * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a + window's workspace + 2005-07-26 Tor Lillqvist * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5403c10b90..9bebc09b51 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-07-26 Elijah Newren + + Revert part of patch from #166379; don't have gtk_window_present() + change a window's desktop, but rather leave it up to the WM. + (#311653) + + * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a + window's workspace + 2005-07-26 Tor Lillqvist * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5403c10b90..9bebc09b51 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-07-26 Elijah Newren + + Revert part of patch from #166379; don't have gtk_window_present() + change a window's desktop, but rather leave it up to the WM. + (#311653) + + * gtk/gtkwindow.c (gtk_window_present_with_time): Don't change a + window's workspace + 2005-07-26 Tor Lillqvist * gtk/gtkplug-win32.c: Declare GetAncestor() and define GA_PARENT diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 7d0da98eaf..5d40b2711b 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -6048,9 +6048,6 @@ gtk_window_present_with_time (GtkWindow *window, #endif } -#ifdef GDK_WINDOWING_X11 - gdk_x11_window_move_to_current_desktop (widget->window); -#endif gdk_window_focus (widget->window, timestamp); } else