Support for multiple radar sites

[aweather] / src / plugins / radar.h

diff --git a/src/plugins/radar.h b/src/plugins/radar.h
index 8175e35506f18b5a45a784ce96330ecbbac864e7..47f637e56675fb15d1ca8c8fa9e8b7056d070ce0 100644 (file)
--- a/src/plugins/radar.h
+++ b/src/plugins/radar.h
@@ -34,29 +34,19 @@
 typedef struct _GisPluginRadar        GisPluginRadar;
 typedef struct _GisPluginRadarClass   GisPluginRadarClass;
 
+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;
-
-       /* Tab area */
-       GtkWidget *config_body;
-       GtkWidget *progress_bar;
-       GtkWidget *progress_label;
-
-       /* Radar lists */
-       GMutex    *load_mutex;
+       GisViewer  *viewer;
+       GisPrefs   *prefs;
+       GtkWidget  *config;
        AWeatherColormap *colormap;
-       gpointer   radar;
-       gchar     *cur_site;
-       gchar     *cur_time;
+
+       GHashTable *sites;
+       GisHttp    *sites_http;
 };
 
 struct _GisPluginRadarClass {