[balsa/wip/gmime3: 32/197] Save a time-out id and remove the GSource

[Peter Bloomfield <peterb src gnome org>]

commit c6c3f1f8dce2f5454c3d93df93dc1e4b945170b3
Author: Albrecht Dreß <albrecht dress arcor de>
Date:   Sat Jul 15 12:21:08 2017 -0400

    Save a time-out id and remove the GSource
    
        * libbalsa/libbalsa-progress.c (revealer_destroy_notify),
        (libbalsa_progress_dialog_update), (remove_progress_widget):
        save a time-out id and remove the GSource if the progress dialog
        is closed before the time-out expires.
    
    Signed-off-by: Peter Bloomfield <PeterBloomfield bellsouth net>

 ChangeLog |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01796c5..f2c14a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,10 +41,6 @@
        * libbalsa/address.c (libbalsa_address_get_edit_widget): do not
        use old style declaration.
 
-<<<<<<< HEAD
-=======
->>>>>>> 3d41c63... Build with -Wshadow
->>>>>>> e671bfa3... Build with -Wshadow
 2017-07-15  Albrecht Dreß
 
        * libbalsa/libbalsa-progress.c (revealer_destroy_notify),