X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fweather.h;h=166e3ae0c9c6ff44d8f62006c65e6e0a0ad53e0e;hb=dc55c7d0a90b79105cd9b20cb86af94a20a2daab;hp=3c9b9d4a54904bde775e4e16a76657d84e56257b;hpb=3bb9b4b6b512e9d5d5cbd21da96095eed4790c22;p=monky

diff --git a/src/weather.h b/src/weather.h
index 3c9b9d4..166e3ae 100644
--- 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,33 +30,17 @@
 #ifndef WEATHER_H_
 #define WEATHER_H_
 
-/* WEATHER data */
-typedef struct PWEATHER_ {
-  char lastupd[32];
-  char xoap_t[32];
-  int temp;
-  int dew;
-  int cc;
-  int bar;
-  int wind_s;
-  int wind_d;
-  int hmid;
-  int wc;
-  /*
-   * 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];
+/* Prototypes */
+void weather_free_info(void);
 
-  */
-} PWEATHER;
+#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 */
 
-/* Prototypes */
-void init_weather_info(void);
-void free_weather_info(void);
-void process_weather_info(char *p, int p_max_size, char *uri, char *data_type, int interval);
+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_*/