diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-01 12:07:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-13 23:27:51 +0800 |
| commit | f59681796df8fe0138a1754abbe8ec781bc1535e (patch) | |
| tree | 0ced0c119ffed095713d7f64732686df9b2d9152 /calendar/gui/comp-util.c | |
| parent | bf4a1a13e3295deefc4031a446627ff9b1c95c7a (diff) | |
| download | gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.gz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.bz2 gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.lz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.xz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.zst gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'calendar/gui/comp-util.c')
| -rw-r--r-- | calendar/gui/comp-util.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index d44914fb46..43f87f7fa1 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -626,13 +626,16 @@ datetime_to_zone (ECalClient *client, ECalComponentDateTime *date, const gchar * if (!from) { GError *error = NULL; - if (!e_cal_client_get_timezone_sync (client, date->tzid, &from, NULL, &error)) + e_cal_client_get_timezone_sync ( + client, date->tzid, &from, NULL, &error); + + if (error != NULL) { g_warning ( "%s: Could not get timezone '%s' from server: %s", - G_STRFUNC, date->tzid ? date->tzid : "", error ? error->message : "Unknown error"); - - if (error) + G_STRFUNC, date->tzid ? date->tzid : "", + error->message); g_error_free (error); + } } to = icaltimezone_get_builtin_timezone_from_tzid (tzid); @@ -714,10 +717,15 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, /* Get the master component */ e_cal_component_get_uid (comp, &uid); - if (!e_cal_client_get_object_sync (client, uid, NULL, &icalcomp, NULL, &error)) { - g_warning ("Unable to get the master component: %s", error ? error->message : "Unknown error"); - if (error) - g_error_free (error); + + e_cal_client_get_object_sync ( + client, uid, NULL, &icalcomp, NULL, &error); + + if (error != NULL) { + g_warning ( + "Unable to get the master component: %s", + error->message); + g_error_free (error); return; } |