From: Francesco Mazzoli <f@mazzo.li>
Date: Sat, 3 Nov 2012 11:17:31 +0000 (+0000)
Subject: refactor, name changes
X-Git-Tag: 4.4~33
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1055973f66bc7c94ea9a05a9cbb7d1b83a338c38;p=i3%2Fi3

refactor, name changes

We need to send the workspace event earlier, because otherwise 'old'
might already be destroyed (if it was empty).
---

diff --git a/src/workspace.c b/src/workspace.c
index fbd68dba..e277f072 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -338,7 +338,7 @@ static void workspace_defer_update_urgent_hint_cb(EV_P_ ev_timer *w, int revents
  * For the "focus" event we send, along the usual "change" field, also the
  * current and previous workspace, in "current" and "old" respectively.
  */
-static void _workspace_focus_event(Con *current, Con *old) {
+static void ipc_send_workspace_focus_event(Con *current, Con *old) {
     yajl_gen gen = ygenalloc();
 
     y(map_open);
@@ -440,6 +440,8 @@ static void _workspace_show(Con *workspace) {
     } else
         con_focus(next);
 
+    ipc_send_workspace_focus_event(workspace, old);
+
     DLOG("old = %p / %s\n", old, (old ? old->name : "(null)"));
     /* Close old workspace if necessary. This must be done *after* doing
      * urgency handling, because tree_close() will do a con_focus() on the next
@@ -466,8 +468,6 @@ static void _workspace_show(Con *workspace) {
 
     /* Update the EWMH hints */
     ewmh_update_current_desktop();
-
-    _workspace_focus_event(workspace, current);
 }
 
 /*