#include "config.h"
+/* Needed for trunc */
+#define _ISOC9X_SOURCE 1
+#define _ISOC99_SOURCE 1
+#include <math.h>
#include <string.h>
#include <time.h>
GeoclueAddress *gc_address;
gboolean reduce_accuracy;
- gdouble reduce_value;
EmpathyAccountManager *account_manager;
/* The idle id for publish_on_idle func */
{
GValue *new_value;
/* Discard street information if reduced accuracy is on */
- if (priv->reduce_accuracy && strcmp (key, EMPATHY_LOCATION_STREET) == 0)
+ if (priv->reduce_accuracy &&
+ !tp_strdiff (key, EMPATHY_LOCATION_STREET))
continue;
new_value = tp_g_value_slice_new_string (value);
if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
{
- longitude += priv->reduce_value;
+
+ if (priv->reduce_accuracy)
+ /* Truncate at 1 decimal place */
+ longitude = trunc (longitude * 10.0) / 10.0;
+
new_value = tp_g_value_slice_new_double (longitude);
g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_LON),
new_value);
if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
{
- latitude += priv->reduce_value;
+ if (priv->reduce_accuracy)
+ /* Truncate at 1 decimal place */
+ latitude = trunc (latitude * 10.0) / 10.0;
+
new_value = tp_g_value_slice_new_double (latitude);
g_hash_table_replace (priv->location, g_strdup (EMPATHY_LOCATION_LAT),
new_value);
if (!empathy_conf_get_bool (conf, key, &resource_enabled))
return;
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK) == 0)
+ if (tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK) == FALSE)
resource = GEOCLUE_RESOURCE_NETWORK;
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL) == 0)
+ if (tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL) == FALSE)
resource = GEOCLUE_RESOURCE_CELL;
- if (strcmp (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS) == 0)
+ if (tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS) == FALSE)
resource = GEOCLUE_RESOURCE_GPS;
if (resource_enabled)
return;
priv->reduce_accuracy = enabled;
- if (enabled)
- {
- GRand *rand = g_rand_new_with_seed (time (NULL));
- priv->reduce_value = g_rand_double_range (rand, -0.25, 0.25);
- g_rand_free (rand);
- }
- else
- {
- priv->reduce_value = 0.0;
- }
-
if (!priv->geoclue_is_setup)
return;
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
- <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will have a random value added (±0.25°).</property>
+ <property name="label" translatable="yes">Reduced location accuracy means that nothing more precise than your city, state and country will be published. GPS coordinates will be accurate to 1 decimal place.</property>
<attributes>
<attribute name="scale" value="0.8"/>
</attributes>