X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Faweather-gui.h;h=fb4415f6b0b29f203b8d9eb2ef770194df21ce8f;hb=c45d5a6177fe71ff1028887a1fbb01152de96835;hp=476cab18ac7201c9d370266dd85b78ad641e0ddf;hpb=f705ad00b5d94f8ddc59575737b79feed191b404;p=aweather

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index 476cab1..fb4415f 100644
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,8 @@
 
 #include <gtk/gtk.h>
 #include <glib-object.h>
-#include "gis-opengl.h"
-#include "gis-world.h"
-#include "gis-view.h"
-#include "aweather-plugin.h"
+
+#include <gis/gis.h>
 
 /* Type macros */
 #define AWEATHER_TYPE_GUI            (aweather_gui_get_type())
@@ -40,12 +38,10 @@ struct _AWeatherGui {
 	GtkWindow parent_instance;
 
 	/* instance members */
-	GtkBuilder *builder;
-	GisWorld   *world;
-	GisView    *view;
-	GisOpenGL  *opengl;
-	GList      *plugins;
-	GKeyFile   *prefs;
+	GtkBuilder   *builder;
+	GisViewer    *viewer;
+	GisPlugins   *plugins;
+	GisPrefs     *prefs;
 	GtkListStore *gtk_plugins;
 };
 
@@ -60,14 +56,12 @@ GType aweather_gui_get_type(void);
 /* Methods */
 AWeatherGui *aweather_gui_new();
 
-GisWorld    *aweather_gui_get_world(AWeatherGui *gui);
-GisOpenGL   *aweather_gui_get_opengl(AWeatherGui *gui);
-GisView     *aweather_gui_get_view(AWeatherGui *gui);
+GisViewer   *aweather_gui_get_viewer(AWeatherGui *gui);
 
 GtkWidget   *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name);
 GObject     *aweather_gui_get_object(AWeatherGui *gui, const gchar *name);
 
-gboolean     aweather_gui_load_plugin(AWeatherGui *gui, const gchar *name);
-gboolean     aweather_gui_unload_plugin(AWeatherGui *gui, const gchar *name);
+void         aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name);
+void         aweather_gui_deattach_plugin(AWeatherGui *self, const gchar *name);
 
 #endif