Added AGPS set/override, and fixed seg fault in Add POI.

git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@220 6c538b50-5814-0410-93ad-8bdf4c0149d1

diff --git a/src/cmenu.c b/src/cmenu.c
index 46b5ccd9f3ec6f92c6039a1a1441098e334bed33..1c5612def3474d62bf4f9b0fcd7e80cbefed50ca 100644 (file)
--- a/src/cmenu.c
+++ b/src/cmenu.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
 
 #ifndef LEGACY
 #    include <hildon/hildon-note.h>
@@ -51,6 +52,10 @@
 #include "poi.h"
 #include "util.h"
 
+#define GCONF_SUPL_KEY_PREFIX "/system/osso/supl"
+#define GCONF_KEY_SUPL_LAT GCONF_SUPL_KEY_PREFIX"/pos_latitude"
+#define GCONF_KEY_SUPL_LON GCONF_SUPL_KEY_PREFIX"/pos_longitude"
+#define GCONF_KEY_SUPL_TIME GCONF_SUPL_KEY_PREFIX"/pos_timestamp"
 
 static void
 cmenu_show_latlon(gint unitx, gint unity)
@@ -259,6 +264,16 @@ cmenu_cb_loc_set_gps(GtkMenuItem *item)
     /* Move mark to new location. */
     map_refresh_mark(_center_mode > 0);
 
+    GConfClient *gconf_client = gconf_client_get_default();
+    GTimeVal curtime;
+
+    gconf_client_set_float(gconf_client, GCONF_KEY_SUPL_LON, _gps.lon, NULL);
+    gconf_client_set_float(gconf_client, GCONF_KEY_SUPL_LAT, _gps.lat, NULL);
+    g_get_current_time(&curtime);
+    gconf_client_set_float(gconf_client, GCONF_KEY_SUPL_TIME, curtime.tv_sec, NULL);
+
+    g_object_unref(gconf_client);
+
     vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
     return TRUE;
 }

diff --git a/src/poi.c b/src/poi.c
index 10981992876acca3c69073c202aa9ddc07eb0cc4..70abfffae597baffafa6ca61738bbd668a0595e2 100644 (file)
--- a/src/poi.c
+++ b/src/poi.c
@@ -1339,9 +1339,9 @@ poi_add_dialog(GtkWidget *parent, gint unitx, gint unity)
         if(SQLITE_OK != sqlite3_bind_double(_stmt_insert_poi, 1, poi.lat)
         || SQLITE_OK != sqlite3_bind_double(_stmt_insert_poi, 2, poi.lon)
         || SQLITE_OK != sqlite3_bind_text(_stmt_insert_poi, 3, poi.label,
-               -1, g_free)
+               -1, SQLITE_STATIC)
         || SQLITE_OK != sqlite3_bind_text(_stmt_insert_poi, 4, poi.desc,
-               -1, g_free)
+               -1, SQLITE_STATIC)
         || SQLITE_OK != sqlite3_bind_int(_stmt_insert_poi, 5, poi.cat_id)
         || SQLITE_DONE != sqlite3_step(_stmt_insert_poi))
         {