X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fgis-viewer.c;h=f02d078e156b7580eed4548733374b2a6d77210d;hb=bbf8154058e9cbae03ebb55cd92f804db4f490aa;hp=b4e3d822811146c2230165fa87b383089b6677c0;hpb=b66ec3a8a09805cd81c7a55bf3e0d1de7efb9ad1;p=grits diff --git a/src/gis-viewer.c b/src/gis-viewer.c index b4e3d82..f02d078 100644 --- a/src/gis-viewer.c +++ b/src/gis-viewer.c @@ -213,12 +213,11 @@ void gis_viewer_setup(GisViewer *viewer, GisPlugins *plugins, GisPrefs *prefs) * * Set the current time for the view */ -void gis_viewer_set_time(GisViewer *viewer, const char *time) +void gis_viewer_set_time(GisViewer *viewer, time_t time) { g_assert(GIS_IS_VIEWER(viewer)); - g_debug("GisViewer: set_time - time=%s", time); - g_free(viewer->time); - viewer->time = g_strdup(time); + g_debug("GisViewer: set_time - time=%ld", time); + viewer->time = time; _gis_viewer_emit_time_changed(viewer); } @@ -230,7 +229,7 @@ void gis_viewer_set_time(GisViewer *viewer, const char *time) * * Returns: the current time */ -gchar *gis_viewer_get_time(GisViewer *viewer) +time_t gis_viewer_get_time(GisViewer *viewer) { g_assert(GIS_IS_VIEWER(viewer)); g_debug("GisViewer: get_time"); @@ -557,7 +556,7 @@ static void gis_viewer_init(GisViewer *viewer) { g_debug("GisViewer: init"); /* Default values */ - viewer->time = g_strdup(""); + viewer->time = time(NULL); viewer->location[0] = 40; viewer->location[1] = -100; viewer->location[2] = 1.5*EARTH_R; @@ -588,7 +587,6 @@ static void gis_viewer_finalize(GObject *gobject) { g_debug("GisViewer: finalize"); GisViewer *viewer = GIS_VIEWER(gobject); - g_free(viewer->time); G_OBJECT_CLASS(gis_viewer_parent_class)->finalize(gobject); } static void gis_viewer_class_init(GisViewerClass *klass) @@ -600,7 +598,7 @@ static void gis_viewer_class_init(GisViewerClass *klass) /** * GisViewer::time-changed: * @viewer: the viewer. - * @time: a string representation of the time. + * @time: the new time. * * The ::time-changed signal is emitted when the viewers current time * changers. @@ -612,10 +610,10 @@ static void gis_viewer_class_init(GisViewerClass *klass) 0, NULL, NULL, - g_cclosure_marshal_VOID__STRING, + g_cclosure_marshal_VOID__LONG, G_TYPE_NONE, 1, - G_TYPE_STRING); + G_TYPE_LONG); /** * GisViewer::location-changed: