Remove site from GisViewer

AWeather determines site based on location now.

diff --git a/src/gis-viewer.c b/src/gis-viewer.c
index a9284d5c1d40030d9d82e32c75cb797854ff0425..947643d70dc96b200fa566f38fc9d593204c0649 100644 (file)
--- 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");
@@ -344,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;
@@ -363,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)
@@ -382,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),

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index 6b95e1a03f9b66ad5c02a76efa841116c8c49b34..102136ca8a9f009509426572a8207dc256cf67fa 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -49,7 +49,6 @@ struct _GisViewer {
        /* instance members */
        GisPlugins *plugins;
        gchar      *time;
-       gchar      *site;
        gdouble     location[3];
        gdouble     rotation[3];
        gboolean    offline;
@@ -99,10 +98,6 @@ void gis_viewer_set_rotation(GisViewer *viewer, gdouble  x, gdouble  y, gdouble
 void gis_viewer_get_rotation(GisViewer *viewer, gdouble *x, gdouble *y, gdouble *z);
 void gis_viewer_rotate      (GisViewer *viewer, gdouble  x, gdouble  y, gdouble  z);
 
-/* To be deprecated, use {get,set}_location */
-void gis_viewer_set_site(GisViewer *viewer, const gchar *site);
-gchar *gis_viewer_get_site(GisViewer *viewer);
-
 void gis_viewer_refresh(GisViewer *viewer);
 
 void gis_viewer_set_offline(GisViewer *viewer, gboolean offline);

diff --git a/src/gis_test.c b/src/gis_test.c
index 746c058a197cd7b39ba6036633dafcf68557e6d2..7a68afa5e144bfb9d4b6a10ec808bf4a48172686 100644 (file)
--- a/src/gis_test.c
+++ b/src/gis_test.c
@@ -61,8 +61,6 @@ int main(int argc, char **argv)
        //gis_plugins_load(plugins, "srtm", viewer, prefs);
        gis_plugins_load(plugins, "test", viewer, prefs);
 
-       gis_viewer_set_site(viewer, "KLSX");
-
        gdk_threads_enter();
        gtk_main();