From ab20672aebf315040447ad96d8ff33d329ffdce9 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 27 Jan 2018 15:24:32 -0200
Subject: [PATCH] weather: Move to a subdirectory

---
 src/gcal-window.c                        | 2 +-
 src/meson.build                          | 7 ++++---
 src/{ => weather}/gcal-weather-info.c    | 0
 src/{ => weather}/gcal-weather-info.h    | 0
 src/{ => weather}/gcal-weather-service.c | 0
 src/{ => weather}/gcal-weather-service.h | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename src/{ => weather}/gcal-weather-info.c (100%)
 rename src/{ => weather}/gcal-weather-info.h (100%)
 rename src/{ => weather}/gcal-weather-service.c (100%)
 rename src/{ => weather}/gcal-weather-service.h (100%)

diff --git a/src/gcal-window.c b/src/gcal-window.c
index dffe6256..c01c2adc 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -1611,6 +1611,7 @@ gcal_window_class_init (GcalWindowClass *klass)
   g_type_ensure (GCAL_TYPE_SEARCH_VIEW);
   g_type_ensure (GCAL_TYPE_SOURCE_DIALOG);
   g_type_ensure (GCAL_TYPE_WEEK_VIEW);
+  g_type_ensure (GCAL_TYPE_WEATHER_SERVICE);
   g_type_ensure (GCAL_TYPE_YEAR_VIEW);
 
   object_class = G_OBJECT_CLASS (klass);
@@ -1792,7 +1793,6 @@ gcal_window_init (GcalWindow *self)
   g_object_bind_property (self, "manager", self->month_view, "manager", G_BINDING_DEFAULT);
   g_object_bind_property (self, "manager", self->year_view, "manager", G_BINDING_DEFAULT);
   g_object_bind_property (self, "manager", self->quick_add_popover, "manager", G_BINDING_DEFAULT);
-  g_object_bind_property (self, "weather-service", self->week_view, "weather-service", G_BINDING_DEFAULT);
   g_object_bind_property (self, "weather-service", self->month_view, "weather-service", G_BINDING_DEFAULT);
   g_object_bind_property (self, "weather-service", self->year_view, "weather-service", G_BINDING_DEFAULT);
 
diff --git a/src/meson.build b/src/meson.build
index 1ac51b38..869e43c8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,6 +31,8 @@ sources = files(
   'views/gcal-week-header.c',
   'views/gcal-week-view.c',
   'views/gcal-year-view.c',
+  'weather/gcal-weather-info.c',
+  'weather/gcal-weather-service.c',
   'gcal-application.c',
   'gcal-clock.c',
   'gcal-date-chooser-day.c',
@@ -50,8 +52,6 @@ sources = files(
   'gcal-time-selector.c',
   'gcal-utils.c',
   'gcal-window.c',
-  'gcal-weather-service.c',
-  'gcal-weather-info.c',
   'gcal-timer.c'
 )
 
@@ -117,7 +117,8 @@ sources += configure_file(
 
 incs = [
   top_inc,
-  include_directories('views')
+  include_directories('views'),
+  include_directories('weather'),
 ]
 
 incs += contrib_incs
diff --git a/src/gcal-weather-info.c b/src/weather/gcal-weather-info.c
similarity index 100%
rename from src/gcal-weather-info.c
rename to src/weather/gcal-weather-info.c
diff --git a/src/gcal-weather-info.h b/src/weather/gcal-weather-info.h
similarity index 100%
rename from src/gcal-weather-info.h
rename to src/weather/gcal-weather-info.h
diff --git a/src/gcal-weather-service.c b/src/weather/gcal-weather-service.c
similarity index 100%
rename from src/gcal-weather-service.c
rename to src/weather/gcal-weather-service.c
diff --git a/src/gcal-weather-service.h b/src/weather/gcal-weather-service.h
similarity index 100%
rename from src/gcal-weather-service.h
rename to src/weather/gcal-weather-service.h