← Back to branch summary

~jm-leddy/ubuntu/oneiric/gvfs/fix-899858

« back to all changes in this revision

Viewing changes to daemon/gvfsbackendftp.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-08-22 12:26:27 UTC
  • mfrom: (1.1.72 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822122627-p38bv0co8hq1cjtz
Tags: 1.9.3-0ubuntu1
* New upstream release
* debian/watch: Look for unstable releases and tar.bz2.
* debian/control.in: Bump libglib2.0-dev build dependency as per upstream
  configure.ac.
* Drop debian/patches/debian-changes-1.9.2-0ubuntu2, not necessary any more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/gvfsbackendftp.c
1442
1442
              g_cancellable_reset (timer_cancel);
1443
1443
              current = cancellable;
1444
1444
              g_clear_error (error);
1445
 
              progress_callback (bytes_copied, total_size, progress_callback_data);
 
1445
              if (progress_callback)
 
1446
                progress_callback (bytes_copied, total_size, progress_callback_data);
1446
1447
              continue;
1447
1448
            }
1448
1449
          else
1467
1468
                  g_cancellable_reset (timer_cancel);
1468
1469
                  current = cancellable;
1469
1470
                  g_clear_error (error);
1470
 
                  progress_callback (bytes_copied, total_size, progress_callback_data);
 
1471
                  if (progress_callback)
 
1472
                    progress_callback (bytes_copied, total_size, progress_callback_data);
1471
1473
                  continue;
1472
1474
                }
1473
1475
              else