[libgweather/drop-old-api: 2/7] tools: Remove use of gweather_location_get_children()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather/drop-old-api: 2/7] tools: Remove use of gweather_location_get_children()
- Date: Fri, 15 Oct 2021 16:05:23 +0000 (UTC)
commit 2590c49b296f8869738903ea3dca60c4d0b916b7
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Oct 15 16:56:57 2021 +0100
tools: Remove use of gweather_location_get_children()
libgweather/tools/test_weather.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/libgweather/tools/test_weather.c b/libgweather/tools/test_weather.c
index 7773462f..31584e5a 100644
--- a/libgweather/tools/test_weather.c
+++ b/libgweather/tools/test_weather.c
@@ -16,29 +16,23 @@ find_loc_children (GWeatherLocation *location,
const char *search_str,
GWeatherLocation **ret)
{
- GWeatherLocation **children;
- guint i;
+ g_autoptr (GWeatherLocation) child = NULL;
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
- children = gweather_location_get_children (location);
- for (i = 0; children[i] != NULL; i++) {
- if (gweather_location_get_level (children[i]) == GWEATHER_LOCATION_WEATHER_STATION) {
+ while ((child = gweather_location_next_child (location, child)) != NULL) {
+ if (gweather_location_get_level (child) == GWEATHER_LOCATION_WEATHER_STATION) {
const char *code;
- code = gweather_location_get_code (children[i]);
+ code = gweather_location_get_code (child);
if (g_strcmp0 (search_str, code) == 0) {
- *ret = gweather_location_ref (children[i]);
+ *ret = gweather_location_ref (child);
return TRUE;
}
} else {
- if (find_loc_children (children[i], search_str, ret))
+ if (find_loc_children (child, search_str, ret))
return TRUE;
}
}
- G_GNUC_END_IGNORE_DEPRECATIONS
-
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]