aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/transaction.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-25 16:50:01 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-06-25 16:50:01 +1000
commitbeacd4d9f9c6da7459bcde0e95031dac41387a7c (patch)
treeab9711b274282290488220cfb0ec85e4f0463d46 /sway/desktop/transaction.c
parentFix potential crash when fullscreen view unmaps (diff)
downloadsway-beacd4d9f9c6da7459bcde0e95031dac41387a7c.tar.gz
sway-beacd4d9f9c6da7459bcde0e95031dac41387a7c.tar.zst
sway-beacd4d9f9c6da7459bcde0e95031dac41387a7c.zip
Rename progress_queue to transaction_progress_queue
Diffstat (limited to 'sway/desktop/transaction.c')
-rw-r--r--sway/desktop/transaction.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 31a9bf57..7727ec6e 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -226,7 +226,7 @@ static void transaction_apply(struct sway_transaction *transaction) {
226 } 226 }
227} 227}
228 228
229static void progress_queue() { 229static void transaction_progress_queue() {
230 struct sway_transaction *transaction = server.head_transaction; 230 struct sway_transaction *transaction = server.head_transaction;
231 struct sway_transaction *next = NULL; 231 struct sway_transaction *next = NULL;
232 while (transaction && !transaction->num_waiting) { 232 while (transaction && !transaction->num_waiting) {
@@ -243,7 +243,7 @@ static int handle_timeout(void *data) {
243 wlr_log(L_DEBUG, "Transaction %p timed out (%li waiting)", 243 wlr_log(L_DEBUG, "Transaction %p timed out (%li waiting)",
244 transaction, transaction->num_waiting); 244 transaction, transaction->num_waiting);
245 transaction->num_waiting = 0; 245 transaction->num_waiting = 0;
246 progress_queue(); 246 transaction_progress_queue();
247 return 0; 247 return 0;
248} 248}
249 249
@@ -355,7 +355,7 @@ static void set_instruction_ready(
355#if !TRANSACTION_DEBUG 355#if !TRANSACTION_DEBUG
356 wlr_log(L_DEBUG, "Transaction %p is ready", transaction); 356 wlr_log(L_DEBUG, "Transaction %p is ready", transaction);
357 wl_event_source_timer_update(transaction->timer, 0); 357 wl_event_source_timer_update(transaction->timer, 0);
358 progress_queue(); 358 transaction_progress_queue();
359#endif 359#endif
360 } 360 }
361} 361}