Refactoring a lot of things. Taking all the opengl and GIS stuff out of

[aweather] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4923b3732045b6e9a18922f625e056c85268738a..843592c54317804727410cd667bf1abbb37d6b14 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -20,6 +20,8 @@
 #include <gtk/gtkgl.h>
 
 #include "aweather-gui.h"
+#include "gis-view.h"
+#include "gis-world.h"
 #include "plugin-radar.h"
 #include "plugin-ridge.h"
 #include "plugin-example.h"
@@ -36,8 +38,8 @@ static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
 static gulong on_map_id = 0;
 static gboolean on_map(AWeatherGui *gui, GdkEvent *event, gchar *site)
 {
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_site(view, site);
+       GisView *view = aweather_gui_get_view(gui);
+       gis_view_set_site(view, site);
        g_signal_handler_disconnect(gui, on_map_id);
        return FALSE;
 }
@@ -78,15 +80,20 @@ int main(int argc, char *argv[])
        g_log_set_handler(NULL, G_LOG_LEVEL_MASK, log_func, NULL);
 
        /* Set up AWeather */
+       /* TODO: Figure out a better way to do plugins
+        *    AWeatherPlugin interface for tabs?
+        *    GisPlugin      interface for expose? */
        AWeatherGui  *gui  = aweather_gui_new();
-       AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_offline(view, opt_offline);
+       GisWorld  *world  = aweather_gui_get_world(gui);
+       GisOpenGL *opengl = aweather_gui_get_opengl(gui);
+       gis_world_set_offline(world, opt_offline);
        on_map_id = g_signal_connect(gui, "map-event", G_CALLBACK(on_map), opt_site);
 
        /* Load plugins */
        aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_example_new(gui)));
        aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_ridge_new(gui)));
        aweather_gui_register_plugin(gui, AWEATHER_PLUGIN(aweather_radar_new(gui)));
+       opengl->plugins = gui->plugins;
 
        gtk_widget_show_all(GTK_WIDGET(gui));
        gtk_main();