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

diff --git a/src/aweather-gui.h b/src/aweather-gui.h
index 476cab1..eb28a55 100644
--- a/src/aweather-gui.h
+++ b/src/aweather-gui.h
@@ -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,12 @@ struct _AWeatherGui {
 	GtkWindow parent_instance;
 
 	/* instance members */
-	GtkBuilder *builder;
-	GisWorld   *world;
-	GisView    *view;
-	GisOpenGL  *opengl;
-	GList      *plugins;
-	GKeyFile   *prefs;
+	GtkBuilder   *builder;
+	GisWorld     *world;
+	GisView      *view;
+	GisOpenGL    *opengl;
+	GisPlugins   *plugins;
+	GisPrefs     *prefs;
 	GtkListStore *gtk_plugins;
 };
 
@@ -67,7 +65,7 @@ GisView     *aweather_gui_get_view(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