Win32 fixes and improvements

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 8175e35506f18b5a45a784ce96330ecbbac864e7..2ed86acb1568c9af3f4935c957364bafb000b8e5 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -34,29 +34,24 @@
 typedef struct _GisPluginRadar        GisPluginRadar;
 typedef struct _GisPluginRadarClass   GisPluginRadarClass;
 
+typedef struct _RadarConus RadarConus;
+typedef struct _RadarSite  RadarSite;
+
 struct _GisPluginRadar {
        GObject parent_instance;
 
        /* instance members */
-       GisViewer *viewer;
-       GisPrefs  *prefs;
-       GisHttp   *http;
-
-       /* Signals */
-       guint      time_changed_id;
-       guint      location_changed_id;
+       GisViewer  *viewer;
+       GisPrefs   *prefs;
+       GtkWidget  *config;
+       AWeatherColormap *colormap;
+       gpointer    *hud_ref;
 
-       /* Tab area */
-       GtkWidget *config_body;
-       GtkWidget *progress_bar;
-       GtkWidget *progress_label;
+       GHashTable *sites;
+       GisHttp    *sites_http;
 
-       /* Radar lists */
-       GMutex    *load_mutex;
-       AWeatherColormap *colormap;
-       gpointer   radar;
-       gchar     *cur_site;
-       gchar     *cur_time;
+       RadarConus *conus;
+       GisHttp    *conus_http;
 };
 
 struct _GisPluginRadarClass {