← Back to branch summary

~ubuntu-branches/ubuntu/vivid/deja-dup/vivid-proposed

« back to all changes in this revision

Viewing changes to deja-dup/monitor/monitor.vala

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2014-09-20 11:35:28 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20140920113528-xqt5nj80o3pd7sfl
Tags: 32.0-0ubuntu1
* New upstream bug fix release
* debian/patches/deprecated-property.patch,
  debian/patches/drop-u1.patch,
  debian/patches/support-valac-0.24.patch:
  - Dropped, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
deja-dup/monitor/monitor.vala
143
143
    return;
144
144
  }
145
145
 
146
 
  if (!reactive_check) {
 
146
  bool was_reactive = reactive_check;
 
147
 
 
148
  if (!was_reactive) {
147
149
    // Now we secretly schedule another kickoff tomorrow, in case something
148
150
    // goes wrong with this run (or user chooses to ignore for now)
149
151
    // If this run is successful, it will change 'last-run' key and this will
155
157
  bool ready = yield is_ready(out when);
156
158
  if (!ready) {
157
159
    debug("Postponing the backup.");
158
 
    if (!reactive_check && when != null)
 
160
    if (!was_reactive && when != null)
159
161
      notify_delay(_("Scheduled backup delayed"), when);
160
162
    return;
161
163
  }
233
235
static void prepare_run(TimeSpan wait_time)
234
236
{
235
237
  // Stop previous run timeout
236
 
  if (timeout_id != 0)
 
238
  if (timeout_id != 0) {
237
239
    Source.remove(timeout_id);
 
240
    timeout_id = 0;
 
241
  }
238
242
 
239
243
  TimeSpan secs = wait_time / TimeSpan.SECOND + 1;
240
244
  if (wait_time > 0 && secs > 0) {