summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2005-01-26 02:47:49 +0000
committerElijah Newren <newren@src.gnome.org>2005-01-26 02:47:49 +0000
commitbb03725397b12c865512b5844dbc04d453a534a1 (patch)
tree7ea6963cf234436cd3dd0e6d01602eaa3e13da87
parent49479d9b67914c0e653c50312be2b15bd1269796 (diff)
downloadmetacity-bb03725397b12c865512b5844dbc04d453a534a1.tar.gz
set the window state hints _after_ applying session information. Fixes
2005-01-25 Elijah Newren <newren@gmail.com> * src/window.c: (meta_window_new_with_attrs): set the window state hints _after_ applying session information. Fixes #164677.
-rw-r--r--ChangeLog5
-rw-r--r--src/window.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 38679350..1774a12b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-01-25 Elijah Newren <newren@gmail.com>
+ * src/window.c: (meta_window_new_with_attrs): set the window state
+ hints _after_ applying session information. Fixes #164677.
+
+2005-01-25 Elijah Newren <newren@gmail.com>
+
Add man pages for metacity-window-demo and metacity-theme-viewer.
Man pages from Jose Moya, auto-fu from Dave Ahlswede. (#143513)
diff --git a/src/window.c b/src/window.c
index defc0830..551149ce 100644
--- a/src/window.c
+++ b/src/window.c
@@ -588,12 +588,6 @@ meta_window_new_with_attrs (MetaDisplay *display,
*/
meta_screen_apply_startup_properties (window->screen, window);
- /* FIXME we have a tendency to set this then immediately
- * change it again.
- */
- set_wm_state (window, window->iconic ? IconicState : NormalState);
- set_net_wm_state (window);
-
if (window->decorated)
meta_window_ensure_frame (window);
@@ -714,6 +708,12 @@ meta_window_new_with_attrs (MetaDisplay *display,
}
}
+ /* FIXME we have a tendency to set this then immediately
+ * change it again.
+ */
+ set_wm_state (window, window->iconic ? IconicState : NormalState);
+ set_net_wm_state (window);
+
/* Sync stack changes */
meta_stack_thaw (window->screen->stack);