← Back to branch summary

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

« back to all changes in this revision

Viewing changes to calendar/backends/weather/e-cal-backend-weather.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:
calendar/backends/weather/e-cal-backend-weather.c
339
339
 
340
340
        /* use timezone of the location to determine date for which this is set */
341
341
        location = gweather_info_get_location (report);
342
 
        if (location && (w_timezone = gweather_location_get_timezone ((GWeatherLocation *)location)))
343
 
                update_zone = icaltimezone_get_builtin_timezone (gweather_timezone_get_tzid ((GWeatherTimezone*)w_timezone));
 
342
        if (location && (w_timezone = gweather_location_get_timezone ((GWeatherLocation *) location)))
 
343
                update_zone = icaltimezone_get_builtin_timezone (gweather_timezone_get_tzid ((GWeatherTimezone *) w_timezone));
344
344
 
345
345
        if (!update_zone)
346
346
                update_zone = icaltimezone_get_utc_timezone ();
551
551
}
552
552
 
553
553
static void
554
 
e_cal_backend_weather_remove (ECalBackendSync *backend,
555
 
                              EDataCal *cal,
556
 
                              GCancellable *cancellable,
557
 
                              GError **perror)
558
 
{
559
 
        ECalBackendWeather *cbw;
560
 
        ECalBackendWeatherPrivate *priv;
561
 
 
562
 
        cbw = E_CAL_BACKEND_WEATHER (backend);
563
 
        priv = cbw->priv;
564
 
 
565
 
        if (!priv->store) {
566
 
                /* lie here a bit, but otherwise the calendar will not be removed, even it should */
567
 
                g_print (G_STRLOC ": Doesn't have a cache?!?");
568
 
                return;
569
 
        }
570
 
 
571
 
        e_cal_backend_store_remove (priv->store);
572
 
}
573
 
 
574
 
static void
575
554
e_cal_backend_weather_receive_objects (ECalBackendSync *backend,
576
555
                                       EDataCal *cal,
577
556
                                       GCancellable *cancellable,
880
859
        sync_class->get_backend_property_sync   = e_cal_backend_weather_get_backend_property;
881
860
        sync_class->open_sync                   = e_cal_backend_weather_open;
882
861
        sync_class->refresh_sync                = e_cal_backend_weather_refresh;
883
 
        sync_class->remove_sync                 = e_cal_backend_weather_remove;
884
862
        sync_class->receive_objects_sync        = e_cal_backend_weather_receive_objects;
885
863
        sync_class->get_object_sync             = e_cal_backend_weather_get_object;
886
864
        sync_class->get_object_list_sync        = e_cal_backend_weather_get_object_list;