Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.

[monky] / src / weather.h

diff --git a/src/weather.h b/src/weather.h
index 2ec24c5..166e3ae 100644 (file)
--- a/src/weather.h
+++ b/src/weather.h
@@ -1,4 +1,6 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -7,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.
  *
@@ -28,23 +30,17 @@
 #ifndef WEATHER_H_
 #define WEATHER_H_
 
-/* WEATHER data */
-typedef struct PWEATHER_ {
-  char lastupd[17];
-  int tmpC;
-  int tmpF;
-  int dew;
-  int cc;
-  int bar;
-  int wind_s;
-  int wind_d;
-  int hmid;
-  int wc;
-} PWEATHER;
-
 /* Prototypes */
-PWEATHER *get_weather_info(char *uri, int delay);
-void init_weather_info(void);
-void free_weather_info(void);
+void weather_free_info(void);
+
+#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_*/