Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.

[monky] / src / weather.h

diff --git a/src/weather.h b/src/weather.h
index c8aceab..166e3ae 100644 (file)
--- a/src/weather.h
+++ b/src/weather.h
@@ -9,7 +9,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -30,42 +30,17 @@
 #ifndef WEATHER_H_
 #define WEATHER_H_
 
-#include "config.h"
-
-/* WEATHER data */
-typedef struct PWEATHER_ {
-       char lastupd[32];
-#ifdef XOAP
-       char xoap_t[32];
-       /*
-        * TODO:
-        * Is it worth investigating about using icons from weather.com?
-        * We could use them for data from noaa as well.
-        * They can display nicely with cimlib_add_image (with appropriate
-        * #ifdefs on imlib2 and x11), and an additional input argoment for position.
-
-        char icon[3];
-
-        */
-#endif /* XOAP */
-       int temp;
-       int dew;
-       int cc;
-       int bar;
-       int wind_s;
-       int wind_d;
-       int hmid;
-       int wc;
-} PWEATHER;
-
 /* Prototypes */
 void weather_free_info(void);
-void weather_process_info(char *p, int p_max_size, char *uri, char *data_type, int interval);
-int process_weather_uri(char *uri, char *locID);
 
 #ifdef XOAP
 void load_xoap_keys(void);
+void scan_weather_forecast_arg(struct text_object *, const char *, void *);
+void print_weather_forecast(struct text_object *, char *, int);
 #endif /* XOAP */
 
+void scan_weather_arg(struct text_object *, const char *, void *);
+void print_weather(struct text_object *, char *, int);
+void free_weather(struct text_object *);
 
 #endif /*WEATHER_H_*/