← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to calendar/gui/dialogs/goto-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/gui/dialogs/goto-dialog.c
52
52
        gint month_val;
53
53
        gint day_val;
54
54
 
 
55
        GCancellable *cancellable;
55
56
} GoToDialog;
56
57
 
57
58
static GoToDialog *dlg = NULL;
94
95
        model = gnome_calendar_get_model (dlg->gcal);
95
96
        client = e_cal_model_get_default_client (model);
96
97
        if (client)
97
 
                tag_calendar_by_client (dlg->ecal, client);
 
98
                tag_calendar_by_client (dlg->ecal, client, dlg->cancellable);
98
99
}
99
100
 
100
101
/* Event handler for day groups in the month item.  A button press makes
248
249
                return;
249
250
        }
250
251
        dlg->gcal = gcal;
 
252
        dlg->cancellable = g_cancellable_new ();
251
253
 
252
254
        model = gnome_calendar_get_model (gcal);
253
255
        timezone = e_cal_model_get_timezone (model);
287
289
                goto_today (dlg);
288
290
 
289
291
        g_object_unref (dlg->builder);
 
292
        g_cancellable_cancel (dlg->cancellable);
 
293
        g_object_unref (dlg->cancellable);
290
294
        g_free (dlg);
291
295
        dlg = NULL;
292
296
}