X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.c;h=947643d70dc96b200fa566f38fc9d593204c0649;hb=cc32fdc32ab49e32fc2fd668c6ae30ade505c027;hp=18ec589a8860ff6d064618b688ea904f5e62330c;hpb=194a225e4148805029672a21dfa1ceabad472364;p=grits

diff --git a/src/gis-viewer.c b/src/gis-viewer.c
index 18ec589..947643d 100644
--- a/src/gis-viewer.c
+++ b/src/gis-viewer.c
@@ -28,7 +28,6 @@
 /* Constants */
 enum {
 	SIG_TIME_CHANGED,
-	SIG_SITE_CHANGED,
 	SIG_LOCATION_CHANGED,
 	SIG_ROTATION_CHANGED,
 	SIG_REFRESH,
@@ -71,11 +70,6 @@ static void _gis_viewer_emit_time_changed(GisViewer *self)
 	g_signal_emit(self, signals[SIG_TIME_CHANGED], 0,
 			self->time);
 }
-static void _gis_viewer_emit_site_changed(GisViewer *self)
-{
-	g_signal_emit(self, signals[SIG_SITE_CHANGED], 0,
-			self->site);
-}
 static void _gis_viewer_emit_refresh(GisViewer *self)
 {
 	g_signal_emit(self, signals[SIG_REFRESH], 0);
@@ -210,23 +204,6 @@ void gis_viewer_rotate(GisViewer *self, gdouble x, gdouble y, gdouble z)
 	_gis_viewer_emit_rotation_changed(self);
 }
 
-/* To be deprecated, use {get,set}_location */
-void gis_viewer_set_site(GisViewer *self, const gchar *site)
-{
-	g_assert(GIS_IS_VIEWER(self));
-	g_debug("GisViewer: set_site");
-	g_free(self->site);
-	self->site = g_strdup(site);
-	_gis_viewer_emit_site_changed(self);
-}
-
-gchar *gis_viewer_get_site(GisViewer *self)
-{
-	g_assert(GIS_IS_VIEWER(self));
-	g_debug("GisViewer: get_site - %s", self->site);
-	return self->site;
-}
-
 void gis_viewer_refresh(GisViewer *self)
 {
 	g_debug("GisViewer: refresh");
@@ -318,20 +295,21 @@ void gis_viewer_end(GisViewer *self)
 	klass->end(self);
 }
 
-void gis_viewer_add(GisViewer *self, GisObject *object)
+gpointer gis_viewer_add(GisViewer *self, GisObject *object,
+		gint level, gboolean sort)
 {
 	GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self);
 	if (!klass->add)
 		g_warning("GisViewer: add - Unimplemented");
-	klass->add(self, object);
+	return klass->add(self, object, level, sort);
 }
 
-void gis_viewer_remove(GisViewer *self, GisObject *object)
+void gis_viewer_remove(GisViewer *self, gpointer ref)
 {
 	GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self);
 	if (!klass->remove)
 		g_warning("GisViewer: remove - Unimplemented");
-	klass->remove(self, object);
+	klass->remove(self, ref);
 }
 
 /****************
@@ -343,7 +321,6 @@ static void gis_viewer_init(GisViewer *self)
 	g_debug("GisViewer: init");
 	/* Default values */
 	self->time = g_strdup("");
-	self->site = g_strdup("");
 	self->location[0] = 40;
 	self->location[1] = -100;
 	self->location[2] = 1.5*EARTH_R;
@@ -362,7 +339,6 @@ static void gis_viewer_finalize(GObject *gobject)
 	g_debug("GisViewer: finalize");
 	GisViewer *self = GIS_VIEWER(gobject);
 	g_free(self->time);
-	g_free(self->site);
 	G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject);
 }
 static void gis_viewer_class_init(GisViewerClass *klass)
@@ -381,17 +357,6 @@ static void gis_viewer_class_init(GisViewerClass *klass)
 			G_TYPE_NONE,
 			1,
 			G_TYPE_STRING);
-	signals[SIG_SITE_CHANGED] = g_signal_new(
-			"site-changed",
-			G_TYPE_FROM_CLASS(gobject_class),
-			G_SIGNAL_RUN_LAST,
-			0,
-			NULL,
-			NULL,
-			g_cclosure_marshal_VOID__STRING,
-			G_TYPE_NONE,
-			1,
-			G_TYPE_STRING);
 	signals[SIG_LOCATION_CHANGED] = g_signal_new(
 			"location-changed",
 			G_TYPE_FROM_CLASS(gobject_class),