Rename GWeatherInfo source and header files

Having the GWeatherInfo API and implementation provided by files called
`gweather-weather.[ch]` doesn't make much sense, and does not really
conform to GNOME's project practices.

8 files changed, 10 insertions, 12 deletions

diff --git a/libgweather/gweather-enum-types.c.tmpl b/libgweather/gweather-enum-types.c.tmpl
index 3e96a16..a429bc5 100644
--- a/libgweather/gweather-enum-types.c.tmpl
+++ b/libgweather/gweather-enum-types.c.tmpl
@@ -4,9 +4,9 @@
 #include "gweather-enum-types.h"
 
 #include "gweather-enums.h"
+#include "gweather-info.h"
 #include "gweather-location.h"
 #include "gweather-timezone.h"
-#include "gweather-weather.h"
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
diff --git a/libgweather/gweather-weather.c b/libgweather/gweather-info.c
index f4439f7..694f609 100644
--- a/libgweather/gweather-weather.c
+++ b/libgweather/gweather-info.c
@@ -1,4 +1,4 @@
-/* gweather-weather.c - Overall weather server functions
+/* gweather-info.c: Weather information data
  *
  * SPDX-FileCopyrightText: The GWeather authors
  * SPDX-License-Identifier: GPL-2.0-or-later
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#include "gweather-weather.h"
+#include "gweather-info.h"
 
 #include "gweather-enum-types.h"
 #include "gweather-private.h"
diff --git a/libgweather/gweather-weather.h b/libgweather/gweather-info.h
index 0bba4db..ddf89d9 100644
--- a/libgweather/gweather-weather.h
+++ b/libgweather/gweather-info.h
@@ -1,4 +1,4 @@
-/* gweather-weather.h - Public header for weather server functions
+/* gweather-info.h - Weather information data
  *
  * SPDX-FileCopyrightText: The GWeather authors
  * SPDX-License-Identifier: GPL-2.0-or-later
diff --git a/libgweather/gweather-private.h b/libgweather/gweather-private.h
index e129611..29d8387 100644
--- a/libgweather/gweather-private.h
+++ b/libgweather/gweather-private.h
@@ -13,7 +13,7 @@
 #include <libsoup/soup.h>
 #include <glib/gi18n-lib.h>
 
-#include "gweather-weather.h"
+#include "gweather-info.h"
 #include "gweather-location.h"
 #include "gweather-db.h"
 
diff --git a/libgweather/gweather.h b/libgweather/gweather.h
index 04a5506..6fe1f39 100644
--- a/libgweather/gweather.h
+++ b/libgweather/gweather.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* gweather.h
  *
  * SPDX-FileCopyrightText: 2008, Red Hat, Inc.
@@ -12,8 +11,8 @@
 #include <libgweather/gweather-version.h>
 #include <libgweather/gweather-enums.h>
 #include <libgweather/gweather-enum-types.h>
+#include <libgweather/gweather-info.h>
 #include <libgweather/gweather-location.h>
 #include <libgweather/gweather-timezone.h>
-#include <libgweather/gweather-weather.h>
 
 #undef IN_GWEATHER_H
diff --git a/libgweather/meson.build b/libgweather/meson.build
index 95c03fa..92f4c81 100644
--- a/libgweather/meson.build
+++ b/libgweather/meson.build
@@ -134,9 +134,9 @@ deps_libgweather = [
 ]
 
 gweather_headers = [
+  'gweather-info.h',
   'gweather-location.h',
   'gweather-timezone.h',
-  'gweather-weather.h',
   'gweather-enums.h'
 ]
 
@@ -153,7 +153,7 @@ install_headers(gweather_headers + ['gweather.h'], subdir: header_subdir)
 gweather_c_sources = [
   gweather_enum_types,
   'gweather.c',
-  'gweather-weather.c',
+  'gweather-info.c',
   'gweather-location.c',
   'gweather-timezone.c',
 ]
diff --git a/libgweather/tools/test_sun_moon.c b/libgweather/tools/test_sun_moon.c
index d6808be..8565068 100644
--- a/libgweather/tools/test_sun_moon.c
+++ b/libgweather/tools/test_sun_moon.c
@@ -13,7 +13,6 @@
 #include <time.h>
 
 #include "gweather-private.h"
-#include "gweather-weather.h"
 
 int
 main (int argc, char **argv)
diff --git a/libgweather/tools/test_weather.c b/libgweather/tools/test_weather.c
index 569307a..9518bc5 100644
--- a/libgweather/tools/test_weather.c
+++ b/libgweather/tools/test_weather.c
@@ -1,6 +1,6 @@
 
-#include "gweather-weather.h"
-#include <gweather-version.h>
+#include "gweather-info.h"
+#include "gweather-version.h"
 
 #include <locale.h>