← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to libedataserver/e-source-alarms.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
libedataserver/e-source-alarms.c
211
211
{
212
212
        g_return_if_fail (E_IS_SOURCE_ALARMS (extension));
213
213
 
214
 
        if ((extension->priv->include_me ? 1 : 0) == (include_me ? 1 : 0))
 
214
        if (extension->priv->include_me == include_me)
215
215
                return;
216
216
 
217
217
        extension->priv->include_me = include_me;
295
295
{
296
296
        g_return_if_fail (E_IS_SOURCE_ALARMS (extension));
297
297
 
 
298
        if (last_notified && !*last_notified)
 
299
                last_notified = NULL;
 
300
 
298
301
        if (last_notified != NULL) {
299
302
                GTimeVal time_val;
300
303
 
301
304
                if (!g_time_val_from_iso8601 (last_notified, &time_val)) {
302
 
                        g_warning ("Invalid timestamp: %s", last_notified);
 
305
                        g_warning ("%s: Invalid timestamp: '%s'", G_STRFUNC, last_notified);
303
306
                        return;
304
307
                }
305
308
        }