weather: removed constraints of 3 locations per uri from docs; corrected possible...
authorCesare Tirabassi <norsetto@ubuntu.com>
Mon, 13 Jul 2009 09:31:20 +0000 (11:31 +0200)
committerCesare Tirabassi <norsetto@ubuntu.com>
Mon, 13 Jul 2009 09:31:20 +0000 (11:31 +0200)
doc/variables.xml
src/conky.c
src/weather.c

index 3dbfbec..14ddb67 100644 (file)
             <option>URI icao data_type (delay_in_minutes)</option>
         </term>
         <listitem>
-            <para>Download, parse and display METAR data from the
-            NWS. icao must be a valid icao for the required
-            location (see for instance
-                       https://pilotweb.nas.faa.gov/qryhtml/icao/).  For the URI, you can use any METAR source, but a good example is http://weather.noaa.gov/pub/data/observations/metar/stations/ (from the US NOAA).</para>
+            <para>Download, parse and display METAR data.</para>
+           <para>For the URI, you can use any METAR source, but
+            a good example is
+           http://weather.noaa.gov/pub/data/observations/metar/stations/
+            (from the US NOAA).</para>
+            icao must be a valid icao for the required location
+            (see for instance https://pilotweb.nas.faa.gov/qryhtml/icao/).
             <para>'data_type' must be one of the following:</para>
             <simplelist>
                 <member>
                 </member>
             </simplelist>
             <para>delay_in_minutes (optional, default 30) cannot be
-            lower than 30 min. Up to 3 stations can be
-            simultaneously queried. Note that this feature is still
-            EXPERIMENTAL.</para>
+            lower than 30 min.</para>
+           <para>Note that this feature is still EXPERIMENTAL.</para>
         </listitem>
     </varlistentry>
     <varlistentry>
index 8c4f06a..21a4531 100644 (file)
@@ -2820,7 +2820,7 @@ static struct text_object *construct_text_object(const char *s,
                        char *data_type = (char *) malloc(32 * sizeof(char));
                        char *tmp_p;
 
-                       argc = sscanf(arg, "%127s %4s %31s %d", uri, icao, data_type, &interval);
+                       argc = sscanf(arg, "%119s %4s %31s %d", uri, icao, data_type, &interval);
 
                        //icao MUST BE upper-case
                        tmp_p = icao;
index 94bc7d3..a7819b6 100644 (file)
@@ -31,8 +31,6 @@
 #include <curl/types.h>
 #include <curl/easy.h>
 
-#define MAX_LOCATIONS 3
-
 /* Possible sky conditions */
 #define NUM_CC_CODES 6
 const char *CC_CODES[NUM_CC_CODES] = {