From ce5cf84240baddb10e21f6e5abaefb64821b1038 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 9 Mar 2011 13:28:31 +0000 Subject: [PATCH] e17: fetch netwm state ealier so netwm.state.modal is set before used in icccm.fetch.client_leader case SVN revision: 57623 --- src/bin/e_border.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 1220e6af9..50f91f75e 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -5956,6 +5956,12 @@ _e_border_eval0(E_Border *bd) bd->changes.border = 0; /* fetch any info queued to be fetched */ + if (bd->client.netwm.fetch.state) + { + e_hints_window_state_get(bd); + bd->client.netwm.fetch.state = 0; + rem_change = 1; + } if (bd->client.icccm.fetch.client_leader) { /* TODO: What do to if the client leader isn't mapped yet? */ @@ -5980,7 +5986,7 @@ _e_border_eval0(E_Border *bd) { bd_leader->group = eina_list_append(bd_leader->group, bd); bd->leader = bd_leader; - /* Only set the window modal to the leader it there is no parent */ + /* Only set the window modal to the leader it there is no parent */ if ((e_config->modal_windows) && (bd->client.netwm.state.modal) && ((!bd->parent) || (bd->parent->modal != bd))) { @@ -6059,12 +6065,6 @@ _e_border_eval0(E_Border *bd) bd->client.icccm.fetch.state = 0; rem_change = 1; } - if (bd->client.netwm.fetch.state) - { - e_hints_window_state_get(bd); - bd->client.netwm.fetch.state = 0; - rem_change = 1; - } if (bd->client.e.fetch.state) { e_hints_window_e_state_get(bd);