[Xfce4-commits] [apps/xfce4-terminal] 01/01: Revert "Save accelerators map on exit"

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit f7a4d2ab0b3da556ac90469efffccedef3bf51cf
Author: Igor <f2404 at yandex.ru>
Date:   Sun Jul 21 11:15:42 2019 -0400

    Revert "Save accelerators map on exit"
    
    It turned out that saving accelerators map on exit prevents users from
    disabling the Alt+N shortcuts by setting them to "" in accels.scm. The
    shortcuts that had been disabled got overridden on the next launch of the
    terminal.
    
    This reverts commit 42e9d6b0b8c8cb67b0446b00184cb811731b2634.
---
 terminal/terminal-app.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 69974cc..27cfbf8 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -169,8 +169,10 @@ terminal_app_finalize (GObject *object)
   if (app->accel_map != NULL)
     g_object_unref (G_OBJECT (app->accel_map));
   if (G_UNLIKELY (app->accel_map_save_id != 0))
-    g_source_remove (app->accel_map_save_id);
-  terminal_app_accel_map_save (app);
+    {
+      g_source_remove (app->accel_map_save_id);
+      terminal_app_accel_map_save (app);
+    }
 
   for (lp = app->windows; lp != NULL; lp = lp->next)
     {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.