Updating branch refs/heads/master
to 2bb0bc83b9afed97c2069b000b8530221a85b744 (commit)
from ca50ac2d39c70d8e2d5ef956374bca72f49ba039 (commit)
commit 2bb0bc83b9afed97c2069b000b8530221a85b744
Author: Nick Schermer <[email protected]>
Date: Sun Dec 30 22:49:33 2012 +0100
Stop activity timeout when destroying a screen.
terminal/terminal-screen.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index c164b62..3a26201 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -327,7 +327,10 @@ terminal_screen_finalize (GObject *object)
{
TerminalScreen *screen = TERMINAL_SCREEN (object);
- if (G_UNLIKELY (screen->background_timer_id != 0))
+ if (screen->activity_timeout_id != 0))
+ g_source_remove (screen->activity_timeout_id);
+
+ if (screen->background_timer_id != 0)
g_source_remove (screen->background_timer_id);
/* detach from preferences */
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
