Merge pull request #14 from ad1217/urgentFix

Remove workspace urgent flag only when i3 removes it. Fixes #13
denesb · May 21, 2015 · 36d6dd9 · 36d6dd9
2 parents 6999491 + 90488ed
commit 36d6dd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/panel-plugin/i3w-plugin.c b/panel-plugin/i3w-plugin.c
@@ -415,7 +415,6 @@ on_workspace_focused(i3workspace *workspace, gpointer data)
 {
     i3WorkspacesPlugin *i3_workspaces = (i3WorkspacesPlugin *) data;
 
-    workspace->urgent = FALSE; // reset the urgent flag
     GtkWidget *button = i3_workspaces->buttons[workspace->num];
     set_button_label(button, workspace, i3_workspaces->config);
 }

diff --git a/panel-plugin/i3wm-delegate.c b/panel-plugin/i3wm-delegate.c
@@ -512,13 +512,10 @@ on_urgent_workspace(i3windowManager *i3wm)
     for (listItem = workspacesList; listItem != NULL; listItem = listItem->next)
     {
         i3ipcWorkspaceReply * workspaceReply = (i3ipcWorkspaceReply *) listItem->data;
-        if (workspaceReply->urgent)
-        {
-            i3workspace *workspace = i3wm->workspaces[workspaceReply->num];
-            workspace->urgent = TRUE;
-            if (i3wm->on_workspace_urgent)
-                i3wm->on_workspace_urgent(workspace, i3wm->on_workspace_urgent_data);
-        }
+        i3workspace *workspace = i3wm->workspaces[workspaceReply->num];
+        workspace->urgent = workspaceReply->urgent;
+        if (i3wm->on_workspace_urgent)
+	        i3wm->on_workspace_urgent(workspace, i3wm->on_workspace_urgent_data);
     }
 
     g_slist_free_full(workspacesList, (GDestroyNotify)i3ipc_workspace_reply_free);