[gvfs/gnome-2-28] Ensure timer_cancel is initialized

[Alexander Larsson <alexl src gnome org>]

commit b98c2a479110b37802bcd9c9ecd7f0298bf33c56
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Dec 1 11:14:48 2009 +0100

    Ensure timer_cancel is initialized
    
    Otherwise it may be used uninitialized if progress_callback is NULL
    (cherry picked from commit 2f86e533d18c67c5e820d08d53769d82884bff71)

 daemon/gvfsbackendftp.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 41eb493..5dfaa4c 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -1167,6 +1167,9 @@ ftp_output_stream_splice (GOutputStream *output,
   GCancellable *current, *timer_cancel;
   gulong cancel_cb_id;
 
+  timer_cancel = NULL;
+  cancel_cb_id = 0;
+
   bytes_copied = 0;
   if (progress_callback)
     {