From dc0f328bf2f07cf7c428109bcc2985f7773a2a0d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Jul 2004 04:45:09 +0000 Subject: [PATCH] Don't set both states at once. (#148789, Matthew Garret) Sat Jul 31 00:42:08 2004 Matthias Clasen * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_below): * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_above): Don't set both states at once. (#148789, Matthew Garret) --- ChangeLog | 10 ++++++++-- ChangeLog.pre-2-10 | 10 ++++++++-- ChangeLog.pre-2-6 | 10 ++++++++-- ChangeLog.pre-2-8 | 10 ++++++++-- gdk/x11/gdkwindow-x11.c | 26 ++++++++++++++++++-------- 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d118a770e1..3ee7b93fa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jul 31 00:42:08 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_below): + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_above): Don't + set both states at once. (#148789, Matthew Garret) + 2004-07-30 Matthias Clasen * gtk/gtkcombobox.c: Don't forget to destroy the row separator @@ -174,7 +180,7 @@ Sat Jul 24 21:38:12 2004 Soeren Sandmann Fri Jul 23 13:04:10 2004 Matthias Clasen - * gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to + * gtk/gtkdnd.c (gtk_drag_dest_set): Revert the change to initialize target_list to an empty list instead of NULL, since it broke tree dnd. (#148215, Ernst Persson) @@ -215,7 +221,7 @@ Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): Add a new :ellipsize property which controls ellipsization of the rendered text. (#144835, Vincent Untz, patch by Jonathan Blandford - and Anders Carlsson + and Anders Carlsson) * gtk/gtkfilechooserdefault.c (create_file_list): Use ellipsization for the name column. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d118a770e1..3ee7b93fa4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jul 31 00:42:08 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_below): + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_above): Don't + set both states at once. (#148789, Matthew Garret) + 2004-07-30 Matthias Clasen * gtk/gtkcombobox.c: Don't forget to destroy the row separator @@ -174,7 +180,7 @@ Sat Jul 24 21:38:12 2004 Soeren Sandmann Fri Jul 23 13:04:10 2004 Matthias Clasen - * gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to + * gtk/gtkdnd.c (gtk_drag_dest_set): Revert the change to initialize target_list to an empty list instead of NULL, since it broke tree dnd. (#148215, Ernst Persson) @@ -215,7 +221,7 @@ Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): Add a new :ellipsize property which controls ellipsization of the rendered text. (#144835, Vincent Untz, patch by Jonathan Blandford - and Anders Carlsson + and Anders Carlsson) * gtk/gtkfilechooserdefault.c (create_file_list): Use ellipsization for the name column. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d118a770e1..3ee7b93fa4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jul 31 00:42:08 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_below): + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_above): Don't + set both states at once. (#148789, Matthew Garret) + 2004-07-30 Matthias Clasen * gtk/gtkcombobox.c: Don't forget to destroy the row separator @@ -174,7 +180,7 @@ Sat Jul 24 21:38:12 2004 Soeren Sandmann Fri Jul 23 13:04:10 2004 Matthias Clasen - * gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to + * gtk/gtkdnd.c (gtk_drag_dest_set): Revert the change to initialize target_list to an empty list instead of NULL, since it broke tree dnd. (#148215, Ernst Persson) @@ -215,7 +221,7 @@ Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): Add a new :ellipsize property which controls ellipsization of the rendered text. (#144835, Vincent Untz, patch by Jonathan Blandford - and Anders Carlsson + and Anders Carlsson) * gtk/gtkfilechooserdefault.c (create_file_list): Use ellipsization for the name column. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d118a770e1..3ee7b93fa4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jul 31 00:42:08 2004 Matthias Clasen + + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_below): + * gdk/x11/gdkwindow-x11.c (gdk_window_set_keep_above): Don't + set both states at once. (#148789, Matthew Garret) + 2004-07-30 Matthias Clasen * gtk/gtkcombobox.c: Don't forget to destroy the row separator @@ -174,7 +180,7 @@ Sat Jul 24 21:38:12 2004 Soeren Sandmann Fri Jul 23 13:04:10 2004 Matthias Clasen - * gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to + * gtk/gtkdnd.c (gtk_drag_dest_set): Revert the change to initialize target_list to an empty list instead of NULL, since it broke tree dnd. (#148215, Ernst Persson) @@ -215,7 +221,7 @@ Thu Jul 22 01:42:16 2004 Matthias Clasen * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_class_init): Add a new :ellipsize property which controls ellipsization of the rendered text. (#144835, Vincent Untz, patch by Jonathan Blandford - and Anders Carlsson + and Anders Carlsson) * gtk/gtkfilechooserdefault.c (create_file_list): Use ellipsization for the name column. diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 7a899102ef..02d8993115 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4263,10 +4263,15 @@ gdk_window_set_keep_above (GdkWindow *window, gboolean setting) return; if (GDK_WINDOW_IS_MAPPED (window)) - gdk_wmspec_change_state (setting, window, - gdk_atom_intern ("_NET_WM_STATE_ABOVE", setting), - setting ? gdk_atom_intern ("_NET_WM_STATE_BELOW", FALSE) - : GDK_NONE); + { + if (setting) + gdk_wmspec_change_state (FALSE, window, + gdk_atom_intern ("_NET_WM_STATE_BELOW", FALSE), + GDK_NONE); + gdk_wmspec_change_state (setting, window, + gdk_atom_intern ("_NET_WM_STATE_ABOVE", FALSE), + GDK_NONE); + } else gdk_synthesize_window_state (window, setting ? GDK_WINDOW_STATE_BELOW : GDK_WINDOW_STATE_ABOVE, @@ -4299,10 +4304,15 @@ gdk_window_set_keep_below (GdkWindow *window, gboolean setting) return; if (GDK_WINDOW_IS_MAPPED (window)) - gdk_wmspec_change_state (setting, window, - gdk_atom_intern ("_NET_WM_STATE_BELOW", setting), - setting ? gdk_atom_intern ("_NET_WM_STATE_ABOVE", FALSE) - : GDK_NONE); + { + if (setting) + gdk_wmspec_change_state (FALSE, window, + gdk_atom_intern ("_NET_WM_STATE_ABOVE", FALSE), + GDK_NONE); + gdk_wmspec_change_state (setting, window, + gdk_atom_intern ("_NET_WM_STATE_BELOW", FALSE), + GDK_NONE); + } else gdk_synthesize_window_state (window, setting ? GDK_WINDOW_STATE_ABOVE : GDK_WINDOW_STATE_BELOW,