Index: libgweather/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-applets/libgweather/ChangeLog,v
retrieving revision 1.10
diff -u -r1.10 ChangeLog
--- libgweather/ChangeLog	15 Jan 2006 11:44:57 -0000	1.10
+++ libgweather/ChangeLog	16 Jan 2006 05:16:19 -0000
@@ -1,3 +1,12 @@
+2006-01-16  Frank Solensky  <frank@solensky.org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* Makefile.am: add weather-moon.c
+	* weather-priv.h:  add moon related fields
+	* weather.c: (request_done), (_weather_info_fill):
+	* weather-moon.c: stub version for API freeze
+
 2006-01-15  Davyd Madeley  <davyd@madeley.id.au>
 
 	* gweather-prefs.c:
Index: libgweather/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-applets/libgweather/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- libgweather/Makefile.am	15 Jan 2006 10:15:19 -0000	1.4
+++ libgweather/Makefile.am	16 Jan 2006 05:16:19 -0000
@@ -12,7 +12,7 @@
 	weather.c weather.h weather-priv.h \
 	weather-metar.c weather-iwin.c weather-met.c \
 	weather-bom.c weather-wx.c \
-	weather-sun.c \
+	weather-sun.c weather-moon.c \
 	gweather-prefs.c gweather-prefs.h \
 	gweather-gconf.c gweather-gconf.h
 
Index: libgweather/weather-priv.h
===================================================================
RCS file: /cvs/gnome/gnome-applets/libgweather/weather-priv.h,v
retrieving revision 1.5
diff -u -r1.5 weather-priv.h
--- libgweather/weather-priv.h	15 Jan 2006 11:44:57 -0000	1.5
+++ libgweather/weather-priv.h	16 Jan 2006 05:16:19 -0000
@@ -107,6 +107,7 @@
 typedef gdouble WeatherPressure;
 typedef gdouble WeatherVisibility;
 typedef time_t WeatherUpdate;
+typedef gdouble WeatherMoonPhase;
 
 struct _WeatherInfo {
     WeatherForecastType forecast_type;
@@ -118,6 +119,7 @@
 
     gboolean valid;
     gboolean sunValid;
+    gboolean moonValid;
     WeatherLocation *location;
     WeatherUpdate update;
     WeatherSky sky;
@@ -130,6 +132,7 @@
     WeatherVisibility visibility;
     WeatherUpdate sunrise;
     WeatherUpdate sunset;
+    WeatherMoonPhase moonphase;
     gchar *forecast;
     gchar *metar_buffer;
     gchar *iwin_buffer;
@@ -206,6 +209,7 @@
 void		requests_done_check	(WeatherInfo *info);
 
 gboolean	calc_sun		(WeatherInfo *info);
+gboolean	calc_moon		(WeatherInfo *info);
 
 #endif /* __WEATHER_PRIV_H_ */
 
Index: libgweather/weather.c
===================================================================
RCS file: /cvs/gnome/gnome-applets/libgweather/weather.c,v
retrieving revision 1.7
diff -u -r1.7 weather.c
--- libgweather/weather.c	15 Jan 2006 11:44:57 -0000	1.7
+++ libgweather/weather.c	16 Jan 2006 05:16:19 -0000
@@ -291,6 +291,7 @@
     gnome_vfs_async_close(handle, close_cb, info);
 
     info->sunValid = info->valid && calc_sun(info);
+    info->moonValid = info->valid && calc_moon(info);
     return;
 }
 
@@ -497,8 +498,10 @@
     info->pressure = -1.0;
     info->visibility = -1.0;
     info->sunValid = FALSE;
+    info->moonValid = FALSE;
     info->sunrise = 0;
     info->sunset = 0;
+    info->moonphase = 0;
     info->forecast = NULL;
     info->radar = NULL;
     info->radar_url = prefs->radar && prefs->radar_custom_url ?
