Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weather-service: Simplify code

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2018-01-27 14:30:02 -02:00
parent 5a6fabddc8
commit 702c089c17
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-weather-service.c
+2 -9
View File
@@ -709,20 +709,15 @@ on_gclue_simple_creation_cb (GClueSimple *_source,
{ {
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
GClueLocation *location; GClueLocation *location;
GClueSimple *location_service;
GClueClient *client; GClueClient *client;
GCAL_ENTRY; GCAL_ENTRY;
/* self->location_service = gclue_simple_new_finish (result, &error);
* Make sure we do not touch self->location_service
* if the current operation was cancelled.
*/
location_service = gclue_simple_new_finish (result, &error);
if (error) if (error)
{ {
g_assert_null (location_service); g_assert_null (self->location_service);
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
/* Cancelled during creation. Silently fail. */; /* Cancelled during creation. Silently fail. */;
@@ -732,8 +727,6 @@ on_gclue_simple_creation_cb (GClueSimple *_source,
GCAL_RETURN (); GCAL_RETURN ();
} }
self->location_service = g_steal_pointer (&location_service);
location = gclue_simple_get_location (self->location_service); location = gclue_simple_get_location (self->location_service);
client = gclue_simple_get_client (self->location_service); client = gclue_simple_get_client (self->location_service);