[Xfce4-commits] [apps/xfce4-notifyd] 01/01: On update reset fade as well (Bug #11858)

[noreply at xfce.org]

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

ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.

commit 2e0560fd682f80c65504af7a64aa1b05fed6054c
Author: Christian Hesse <mail at eworm.de>
Date:   Mon Jul 4 20:00:45 2016 +0200

    On update reset fade as well (Bug #11858)
    
    On update the expire was reset, but fade was ignored. A notification
    that was updated while fading was shown for less than asecond.
    
    Not only reset expire, but reset fade as well and change opacity to its
    correct initial value.
    
    Signed-off-by: Christian Hesse <mail at eworm.de>
    Signed-off-by: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
---
 xfce4-notifyd/xfce-notify-window.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
index 0f73ef4..e05ebd2 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -879,6 +879,12 @@ xfce_notify_window_set_expire_timeout(XfceNotifyWindow *window,
             g_source_remove(window->expire_id);
             window->expire_id = 0;
         }
+        if(window->fade_id) {
+            g_source_remove(window->fade_id);
+            window->fade_id = 0;
+        }
+        gtk_widget_set_opacity(GTK_WIDGET(window), window->normal_opacity);
+
         xfce_notify_window_start_expiration (window);
     }
 }

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