Rename workspaces in startup sequences.

When renaming workspaces, any workspace names in pending startup
sequences also need to be renamed.

diff --git a/include/startup.h b/include/startup.h
index 2f28baa772f9000918c9a6e341579d0f6a94c056..cb784913b303efc859a6894750673b4a596288ee 100644 (file)
--- a/include/startup.h
+++ b/include/startup.h
@@ -44,6 +44,12 @@ void startup_sequence_delete(struct Startup_Sequence *sequence);
  */
 void startup_monitor_event(SnMonitorEvent *event, void *userdata);
 
+/**
+ * Renames workspaces that are mentioned in the startup sequences.
+ *
+ */
+void startup_sequence_rename_workspace(char *old_name, char *new_name);
+
 /**
  * Gets the stored startup sequence for the _NET_STARTUP_ID of a given window.
  *

diff --git a/src/commands.c b/src/commands.c
index 92203e3925ba7ab730d510537238abc84941df4e..d3e2a6e3da59630c4b971b80eba04ef8cf082754 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -2044,6 +2044,8 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
     ewmh_update_desktop_names();
     ewmh_update_desktop_viewport();
     ewmh_update_current_desktop();
+
+    startup_sequence_rename_workspace(old_name, new_name);
 }
 
 /*

diff --git a/src/startup.c b/src/startup.c
index ebe8c1d9439601a426bee70aa512d95c70a7a44f..aa347bd75fe86096096b7bc0b6148f7859fe8a91 100644 (file)
--- a/src/startup.c
+++ b/src/startup.c
@@ -257,6 +257,22 @@ void startup_monitor_event(SnMonitorEvent *event, void *userdata) {
     }
 }
 
+/**
+ * Renames workspaces that are mentioned in the startup sequences.
+ *
+ */
+void startup_sequence_rename_workspace(char *old_name, char *new_name) {
+    struct Startup_Sequence *current;
+    TAILQ_FOREACH(current, &startup_sequences, sequences) {
+        if (strcmp(current->workspace, old_name) != 0)
+            continue;
+        DLOG("Renaming workspace \"%s\" to \"%s\" in startup sequence %s.\n",
+             old_name, new_name, current->id);
+        free(current->workspace);
+        current->workspace = sstrdup(new_name);
+    }
+}
+
 /**
  * Gets the stored startup sequence for the _NET_STARTUP_ID of a given window.
  *