Merge lp:~noskcaj/empathy/geoclue-2.0 into lp:~ubuntu-desktop/empathy/ubuntu

[Jackson Doak]

Use geoclue-2.0 now that it's in main

[Sebastien Bacher (seb128)]

Thanks, but what about the fact that geoclue doesn't support plugin and can't use ubuntu-geoip? What difference would that mean in the user experience?

review: Needs Information

[Tim Lunn (darkxst)]

geoclue-2.0 uses mozilla location service, so the user would still get a location, just not from ubuntu-geoip.

Unmerged revisions

370. By Jackson Doak on 2014-11-08

* Use geoclue-2.0. LP: #1389336
  - Drop Revert-geoclue-2.0.patch
  - Replace old geoclue deps with geoclue-2.0

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-28 17:30:15 +0000
+++ debian/changelog	2014-11-08 20:15:08 +0000
@@ -1,3 +1,11 @@
+empathy (3.12.6-0ubuntu2) vivid; urgency=medium
+
+  * Use geoclue-2.0. LP: #1389336
+    - Drop Revert-geoclue-2.0.patch
+    - Replace old geoclue deps with geoclue-2.0
+
+ -- Jackson Doak <[e-mail]>  Sat, 08 Nov 2014 16:24:34 +1100
+
 empathy (3.12.6-0ubuntu1) vivid; urgency=medium
 
   [ Jackson Doak ]

=== modified file 'debian/control'
--- debian/control	2014-09-30 11:10:19 +0000
+++ debian/control	2014-11-08 20:15:08 +0000
@@ -29,7 +29,7 @@
                libgstreamer-plugins-base1.0-dev,
                libnm-glib-dev (>= 0.7) [linux-any],
                libnm-util-dev (>= 0.7) [linux-any],
-               libgeoclue-dev (>= 0.12),
+               geoclue-2.0,
                libgnome-keyring-dev (>= 2.26.0),
                libgcr-3-dev (>= 2.91.4),
                libfolks-dev (>= 0.9.5),
@@ -65,7 +65,7 @@
          telepathy-mission-control-5 (>= 1:5.12.0),
          gsettings-desktop-schemas,
          gnome-icon-theme (>= 2.30.0),
-         geoclue,
+         geoclue-2.0,
          telepathy-logger (>= 0.2.13),
          dbus-x11,
          gstreamer1.0-pulseaudio

=== removed file 'debian/patches/Revert-geoclue-2.0.patch'
--- debian/patches/Revert-geoclue-2.0.patch	2014-09-24 08:08:59 +0000
+++ debian/patches/Revert-geoclue-2.0.patch	1970-01-01 00:00:00 +0000
@@ -1,1422 +0,0 @@
-Description: Revert 4 upstream git commits so we can use old geoclue
- Reverted commits used for new geoclue:
- https://git.gnome.org/browse/empathy/commit/?id=dcb5ddc560b51cc5eb59a2ef27d91cf279271f36
- https://git.gnome.org/browse/empathy/commit/?id=24238851a5f3617c52bd60d1f99ac5eef0c079a1
- https://git.gnome.org/browse/empathy/commit/?id=32529f49e3935b5f4fd747fcfe2d62322f86ec52
- https://git.gnome.org/browse/empathy/commit/?id=f6f6c6421e0e286db920d3e01fa64cc3ebe4f4df
-Author: Jackson Doak <[e-mail]>
-Origin: upstream
-Forwarded: not-needed
-Last-Update: 2014-09-24
-
---- empathy-3.12.6.orig/configure.ac
-+++ empathy-3.12.6/configure.ac
-@@ -73,7 +73,7 @@ GOA_REQUIRED=3.5.1
- 
- # Optional deps
- ENCHANT_REQUIRED=1.2.0
--GEOCLUE_REQUIRED=1.99.3
-+GEOCLUE_REQUIRED=0.12
- GEOCODE_GLIB_REQUIRED=0.99.1
- ISO_CODES_REQUIRED=0.35
- NAUTILUS_SENDTO_REQUIRED=2.90.0
-@@ -416,18 +416,11 @@ AC_ARG_ENABLE(location,
- if test "x$enable_location" != "xno"; then
-    PKG_CHECK_MODULES(GEOCLUE,
-    [
--      geoclue-2.0 >= $GEOCLUE_REQUIRED
-+      geoclue >= $GEOCLUE_REQUIRED
-    ], have_geoclue="yes", have_geoclue="no")
- 
-    if test "x$have_geoclue" = "xyes"; then
--      GEOCLUE_XML_FILE=`pkg-config --variable=dbus_interface geoclue-2.0`
--      if test "x$GEOCLUE_XML_FILE" = "x"; then
--        echo "Can't find dbus_interface variable in geoclue-2.0.pc"
--        have_geoclue="no"
--      else
--        AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue-2])
--        AC_SUBST(GEOCLUE_XML_FILE)
--      fi
-+      AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
-    fi
- else
-    have_geoclue="no"
---- empathy-3.12.6.orig/data/empathy.convert
-+++ empathy-3.12.6/data/empathy.convert
-@@ -54,5 +54,8 @@ close-main-window = /apps/empathy/hints/
-   
- [org.gnome.Empathy.location]
- publish = /apps/empathy/location/publish
-+resource-network = /apps/empathy/location/resource_network
-+resource-cell = /apps/empathy/location/resource_cell
-+resource-gps = /apps/empathy/location/resource_gps
- reduce-accuracy = /apps/empathy/location/reduce_accuracy
- 
---- empathy-3.12.6.orig/data/org.gnome.Empathy.gschema.xml
-+++ empathy-3.12.6/data/org.gnome.Empathy.gschema.xml
-@@ -256,6 +256,21 @@ present them to the user immediately.</d
-       <summary>Empathy can publish the user's location</summary>
-       <description>Whether Empathy can publish the user's location to their contacts.</description>
-     </key>
-+    <key name="resource-network" type="b">
-+      <default>true</default>
-+      <summary>Empathy can use the network to guess the location</summary>
-+      <description>Whether Empathy can use the network to guess the location.</description>
-+    </key>
-+    <key name="resource-cell" type="b">
-+      <default>true</default>
-+      <summary>Empathy can use the cellular network to guess the location</summary>
-+      <description>Whether Empathy can use the cellular network to guess the location.</description>
-+    </key>
-+    <key name="resource-gps" type="b">
-+      <default>false</default>
-+      <summary>Empathy can use the GPS to guess the location</summary>
-+      <description>Whether Empathy can use the GPS to guess the location.</description>
-+    </key>
-     <key name="reduce-accuracy" type="b">
-       <default>true</default>
-       <summary>Empathy should reduce the location's accuracy</summary>
---- empathy-3.12.6.orig/libempathy-gtk/Makefile.am
-+++ empathy-3.12.6/libempathy-gtk/Makefile.am
-@@ -249,26 +249,11 @@ EXTRA_DIST =					\
- 	$(ui_DATA)
- 
- if HAVE_GEOCLUE
--geoclue-interface.c: geoclue-interface.h
--geoclue-interface.h: Makefile.am
--	gdbus-codegen						\
--		--interface-prefix org.freedesktop.GeoClue2.	\
--		--c-namespace GClue				\
--		--generate-c-code geoclue-interface		\
--		$(GEOCLUE_XML_FILE)
--
--BUILT_SOURCES += \
--	geoclue-interface.h \
--	geoclue-interface.c
--
- libempathy_gtk_handwritten_source +=		\
--	empathy-location-manager.c \
--	empathy-geoclue-helper.c
-+	empathy-location-manager.c
- 
- libempathy_gtk_headers +=			\
--	empathy-location-manager.h \
--	empathy-geoclue-helper.h
--
-+	empathy-location-manager.h
- else
- EXTRA_DIST +=					\
- 	empathy-location-manager.c		\
---- empathy-3.12.6.orig/libempathy-gtk/empathy-geoclue-helper.c
-+++ /dev/null
-@@ -1,523 +0,0 @@
--/*
-- * empathy-geoclue-helper.c
-- *
-- * Copyright (C) 2013 Collabora Ltd. <http://www.collabora.co.uk/>
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-- */
--
--#include "config.h"
--
--#include <gio/gio.h>
--
--#include "empathy-geoclue-helper.h"
--
--#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
--#include "empathy-debug.h"
--
--#define GEOCLUE_BUS_NAME "org.freedesktop.GeoClue2"
--
--/**
-- * SECTION: empathy-geoclue-helper
-- * @title: EmpathyGeoclueHelper
-- * @short_description: TODO
-- *
-- * TODO
-- */
--
--/**
-- * EmpathyGeoclueHelper:
-- *
-- * Data structure representing a #EmpathyGeoclueHelper.
-- *
-- * Since: UNRELEASED
-- */
--
--/**
-- * EmpathyGeoclueHelperClass:
-- *
-- * The class of a #EmpathyGeoclueHelper.
-- *
-- * Since: UNRELEASED
-- */
--
--static void async_initable_iface_init (GAsyncInitableIface *iface);
--
--G_DEFINE_TYPE_WITH_CODE (EmpathyGeoclueHelper, empathy_geoclue_helper,
--    G_TYPE_OBJECT,
--    G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init));
--
--enum
--{
--  PROP_DISTANCE_THRESHOLD = 1,
--  PROP_LOCATION,
--  N_PROPS
--};
--
--enum
--{
--  SIG_LOCATION_CHANGED,
--  LAST_SIGNAL
--};
--
--static guint signals[LAST_SIGNAL];
--
--struct _EmpathyGeoclueHelperPriv
--{
--  guint distance_threshold;
--  GClueLocation *location;
--
--  gboolean started;
--  GClueClient *client;
--};
--
--static void
--empathy_geoclue_helper_get_property (GObject *object,
--    guint property_id,
--    GValue *value,
--    GParamSpec *pspec)
--{
--  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
--
--  switch (property_id)
--    {
--      case PROP_DISTANCE_THRESHOLD:
--        g_value_set_uint (value, self->priv->distance_threshold);
--        break;
--      case PROP_LOCATION:
--        g_value_set_object (value, self->priv->location);
--        break;
--      default:
--        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--        break;
--    }
--}
--
--static void
--empathy_geoclue_helper_set_property (GObject *object,
--    guint property_id,
--    const GValue *value,
--    GParamSpec *pspec)
--{
--  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
--
--  switch (property_id)
--    {
--      case PROP_DISTANCE_THRESHOLD:
--        self->priv->distance_threshold = g_value_get_uint (value);
--        break;
--      default:
--        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--        break;
--    }
--}
--
--static void
--empathy_geoclue_helper_constructed (GObject *object)
--{
--  //EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
--  void (*chain_up) (GObject *) =
--      ((GObjectClass *) empathy_geoclue_helper_parent_class)->constructed;
--
--  chain_up (object);
--}
--
--static void
--empathy_geoclue_helper_dispose (GObject *object)
--{
--  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
--  void (*chain_up) (GObject *) =
--      ((GObjectClass *) empathy_geoclue_helper_parent_class)->dispose;
--
--  if (self->priv->started)
--    {
--      gclue_client_call_stop (self->priv->client, NULL, NULL, NULL);
--
--      self->priv->started = FALSE;
--    }
--
--  g_clear_object (&self->priv->location);
--  g_clear_object (&self->priv->client);
--
--  chain_up (object);
--}
--
--static void
--empathy_geoclue_helper_finalize (GObject *object)
--{
--  //EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
--  void (*chain_up) (GObject *) =
--      ((GObjectClass *) empathy_geoclue_helper_parent_class)->finalize;
--
--  chain_up (object);
--}
--
--static void
--empathy_geoclue_helper_class_init (
--    EmpathyGeoclueHelperClass *klass)
--{
--  GObjectClass *oclass = G_OBJECT_CLASS (klass);
--  GParamSpec *spec;
--
--  oclass->get_property = empathy_geoclue_helper_get_property;
--  oclass->set_property = empathy_geoclue_helper_set_property;
--  oclass->constructed = empathy_geoclue_helper_constructed;
--  oclass->dispose = empathy_geoclue_helper_dispose;
--  oclass->finalize = empathy_geoclue_helper_finalize;
--
--  /**
--   * EmpathyGeoclueHelper:distance-threshold:
--   *
--   * TODO
--   *
--   * Since: UNRELEASED
--   */
--  spec = g_param_spec_uint ("distance-threshold", "distance-threshold",
--      "DistanceThreshold",
--      0, G_MAXUINT32, 0,
--      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
--  g_object_class_install_property (oclass, PROP_DISTANCE_THRESHOLD, spec);
--
--  /**
--   * EmpathyGeoclueHelper:location:
--   *
--   * TODO
--   *
--   * Since: UNRELEASED
--   */
--  spec = g_param_spec_object ("location", "location", "GClueLocation",
--      GCLUE_TYPE_LOCATION,
--      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
--  g_object_class_install_property (oclass, PROP_LOCATION, spec);
--
--  /**
--   * EmpathyGeoclueHelper::location-changed:
--   * @self: a #EmpathyGeoclueHelper
--   *
--   * TODO
--   *
--   * Since: UNRELEASED
--   */
--  signals[SIG_LOCATION_CHANGED] = g_signal_new ("location-changed",
--      G_OBJECT_CLASS_TYPE (klass),
--      G_SIGNAL_RUN_LAST,
--      0, NULL, NULL, NULL,
--      G_TYPE_NONE,
--      1, GCLUE_TYPE_LOCATION);
--
--  g_type_class_add_private (klass, sizeof (EmpathyGeoclueHelperPriv));
--}
--
--static void
--empathy_geoclue_helper_init (EmpathyGeoclueHelper *self)
--{
--  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
--      EMPATHY_TYPE_GEOCLUE_HELPER, EmpathyGeoclueHelperPriv);
--}
--
--static void
--location_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  EmpathyGeoclueHelper *self = user_data;
--  GError *error = NULL;
--
--  g_clear_object (&self->priv->location);
--
--  self->priv->location = gclue_location_proxy_new_finish (result, &error);
--  if (self->priv->location == NULL)
--    {
--      DEBUG ("Failed to create Location proxy: %s", error->message);
--      g_error_free (error);
--    }
--
--  g_signal_emit (self, signals[SIG_LOCATION_CHANGED], 0, self->priv->location);
--
--  g_object_notify (G_OBJECT (self), "location");
--}
--
--static void
--location_updated_cb (GClueClient *client,
--    const gchar *old,
--    const gchar *new,
--    EmpathyGeoclueHelper *self)
--{
--  gclue_location_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
--      GEOCLUE_BUS_NAME, new,
--      NULL, location_cb, self);
--}
--
--static void
--client_start_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  GTask *task = user_data;
--  EmpathyGeoclueHelper *self = g_task_get_source_object (task);
--  GClueClient *client = GCLUE_CLIENT (source);
--  GError *error = NULL;
--
--  if (!gclue_client_call_start_finish (client, result, &error))
--    {
--      DEBUG ("Failed to start Geoclue client: %s", error->message);
--      g_error_free (error);
--      return;
--    }
--
--  self->priv->started = TRUE;
--
--  g_task_return_boolean (task, TRUE);
--  g_object_unref (task);
--}
--
--static void
--client_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  GTask *task = user_data;
--  EmpathyGeoclueHelper *self = g_task_get_source_object (task);
--  GError *error = NULL;
--
--  self->priv->client = gclue_client_proxy_new_finish (result, &error);
--  if (!gclue_client_proxy_new_for_bus_finish (result, &error))
--    {
--      DEBUG ("Failed to create Geoclue client: %s", error->message);
--      g_task_return_error (task, error);
--      goto out;
--    }
--
--  g_signal_connect_object (self->priv->client, "location-updated",
--      G_CALLBACK (location_updated_cb), self, 0);
--
--  g_object_set (self->priv->client,
--      "distance-threshold", self->priv->distance_threshold,
--      NULL);
--
--  g_task_return_boolean (task, TRUE);
--
--out:
--  g_object_unref (task);
--}
--
--static void
--get_client_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  GTask *task = user_data;
--  GError *error = NULL;
--  gchar *path;
--
--  if (!gclue_manager_call_get_client_finish (GCLUE_MANAGER (source), &path,
--        result, &error))
--    {
--      DEBUG ("GetClient failed: %s", error->message);
--      g_task_return_error (task, error);
--      g_object_unref (task);
--      return;
--    }
--
--  gclue_client_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
--      GEOCLUE_BUS_NAME, path, NULL, client_cb, task);
--
--  g_free (path);
--}
--
--static void
--manager_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  GTask *task = user_data;
--  GError *error = NULL;
--  GClueManager *mgr;
--
--  mgr = gclue_manager_proxy_new_for_bus_finish (result, &error);
--  if (mgr == NULL)
--    {
--      DEBUG ("Failed to create Geoclue manager: %s", error->message);
--      g_task_return_error (task, error);
--      g_object_unref (task);
--      return;
--    }
--
--  gclue_manager_call_get_client (mgr, NULL, get_client_cb, task);
--  g_object_unref (mgr);
--}
--
--void
--empathy_geoclue_helper_start_async (EmpathyGeoclueHelper *self,
--    GAsyncReadyCallback callback,
--    gpointer user_data)
--{
--  GTask *task;
--
--  task = g_task_new (self, NULL, callback, user_data);
--
--  if (self->priv->started)
--    {
--      g_task_return_boolean (task, TRUE);
--      g_object_unref (task);
--      return;
--    }
--
--  gclue_client_call_start (self->priv->client, NULL, client_start_cb, task);
--}
--
--gboolean
--empathy_geoclue_helper_start_finish (EmpathyGeoclueHelper *self,
--    GAsyncResult *result,
--    GError **error)
--{
--  g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
--
--  return g_task_propagate_boolean (G_TASK (result), error);
--}
--
--GClueLocation *
--empathy_geoclue_helper_get_location (EmpathyGeoclueHelper *self)
--{
--  return self->priv->location;
--}
--
--static void
--empathy_geoclue_helper_init_async (GAsyncInitable *initable,
--    gint io_priority,
--    GCancellable *cancellable,
--    GAsyncReadyCallback callback,
--    gpointer user_data)
--{
--  GTask *task;
--
--  task = g_task_new (initable, cancellable, callback, user_data);
--
--  gclue_manager_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
--      GEOCLUE_BUS_NAME, "/org/freedesktop/GeoClue2/Manager",
--      NULL, manager_cb, task);
--}
--
--static gboolean
--empathy_geoclue_helper_init_finish (GAsyncInitable *initable,
--    GAsyncResult *result,
--    GError **error)
--{
--  g_return_val_if_fail (g_task_is_valid (result, initable), FALSE);
--
--  return g_task_propagate_boolean (G_TASK (result), error);
--}
--
--static void
--async_initable_iface_init (GAsyncInitableIface *iface)
--{
--  iface->init_async = empathy_geoclue_helper_init_async;
--  iface->init_finish = empathy_geoclue_helper_init_finish;
--}
--
--void
--empathy_geoclue_helper_new_async (guint distance_threshold,
--    GAsyncReadyCallback callback,
--    gpointer user_data)
--{
--  g_async_initable_new_async (EMPATHY_TYPE_GEOCLUE_HELPER,
--      G_PRIORITY_DEFAULT, NULL, callback, user_data,
--      "distance-threshold", distance_threshold,
--      NULL);
--}
--
--EmpathyGeoclueHelper *
--empathy_geoclue_helper_new_finish (GAsyncResult *result,
--    GError **error)
--{
--  GObject *object, *source_object;
--
--  source_object = g_async_result_get_source_object (result);
--
--  object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
--      result, error);
--  g_object_unref (source_object);
--
--  if (object != NULL)
--    return EMPATHY_GEOCLUE_HELPER (object);
--  else
--    return NULL;
--}
--
--static void
--new_started_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (source);
--  GTask *new_started_task = user_data;
--  GError *error = NULL;
--
--  if (!empathy_geoclue_helper_start_finish (self, result, &error))
--    {
--      g_task_return_error (new_started_task, error);
--      g_object_unref (self);
--      goto out;
--    }
--
--  /* pass ownership of self to g_task_return_error */
--  g_task_return_pointer (new_started_task, self, g_object_unref);
--
--out:
--  g_object_unref (new_started_task);
--}
--
--static void
--new_started_init_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
--{
--  GTask *new_started_task = user_data;
--  EmpathyGeoclueHelper *self;
--  GError *error = NULL;
--
--  self = empathy_geoclue_helper_new_finish (result, &error);
--  if (self == NULL)
--    {
--      g_task_return_error (new_started_task, error);
--      g_object_unref (new_started_task);
--      return;
--    }
--
--  /* Pass owernship of 'self' to new_started_cb */
--  empathy_geoclue_helper_start_async (self, new_started_cb, new_started_task);
--}
--
--void
--empathy_geoclue_helper_new_started_async (guint distance_threshold,
--    GAsyncReadyCallback callback,
--    gpointer user_data)
--{
--  GTask *new_started_task;
--
--  new_started_task = g_task_new (NULL, NULL, callback, user_data);
--
--  empathy_geoclue_helper_new_async (distance_threshold, new_started_init_cb,
--      new_started_task);
--}
--
--EmpathyGeoclueHelper *
--empathy_geoclue_helper_new_started_finish (GAsyncResult *result,
--    GError **error)
--{
--  g_return_val_if_fail (g_task_is_valid (result, NULL), NULL);
--
--  return g_task_propagate_pointer (G_TASK (result), error);
--}
---- empathy-3.12.6.orig/libempathy-gtk/empathy-geoclue-helper.h
-+++ /dev/null
-@@ -1,99 +0,0 @@
--/*
-- * empathy-geoclue-helper.h
-- *
-- * Copyright (C) 2013 Collabora Ltd. <http://www.collabora.co.uk/>
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2.1 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-- */
--
--#ifndef __EMPATHY_GEOCLUE_HELPER_H__
--#define __EMPATHY_GEOCLUE_HELPER_H__
--
--#include <glib-object.h>
--
--G_BEGIN_DECLS
--
--#include "geoclue-interface.h"
--
--typedef struct _EmpathyGeoclueHelper EmpathyGeoclueHelper;
--typedef struct _EmpathyGeoclueHelperClass EmpathyGeoclueHelperClass;
--typedef struct _EmpathyGeoclueHelperPriv EmpathyGeoclueHelperPriv;
--
--struct _EmpathyGeoclueHelperClass
--{
--  /*<private>*/
--  GObjectClass parent_class;
--};
--
--struct _EmpathyGeoclueHelper
--{
--  /*<private>*/
--  GObject parent;
--  EmpathyGeoclueHelperPriv *priv;
--};
--
--GType empathy_geoclue_helper_get_type (void);
--
--/* TYPE MACROS */
--#define EMPATHY_TYPE_GEOCLUE_HELPER \
--  (empathy_geoclue_helper_get_type ())
--#define EMPATHY_GEOCLUE_HELPER(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
--    EMPATHY_TYPE_GEOCLUE_HELPER, \
--    EmpathyGeoclueHelper))
--#define EMPATHY_GEOCLUE_HELPER_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST((klass), \
--    EMPATHY_TYPE_GEOCLUE_HELPER, \
--    EmpathyGeoclueHelperClass))
--#define EMPATHY_IS_GEOCLUE_HELPER(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
--    EMPATHY_TYPE_GEOCLUE_HELPER))
--#define EMPATHY_IS_GEOCLUE_HELPER_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE((klass), \
--    EMPATHY_TYPE_GEOCLUE_HELPER))
--#define EMPATHY_GEOCLUE_HELPER_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
--    EMPATHY_TYPE_GEOCLUE_HELPER, \
--    EmpathyGeoclueHelperClass))
--
--void empathy_geoclue_helper_new_async (guint distance_threshold,
--    GAsyncReadyCallback callback,
--    gpointer user_data);
--
--EmpathyGeoclueHelper * empathy_geoclue_helper_new_finish (GAsyncResult *result,
--    GError **error);
--
--void empathy_geoclue_helper_new_started_async (guint distance_threshold,
--    GAsyncReadyCallback callback,
--    gpointer user_data);
--
--EmpathyGeoclueHelper * empathy_geoclue_helper_new_started_finish (
--    GAsyncResult *result,
--    GError **error);
--
--void empathy_geoclue_helper_start_async (EmpathyGeoclueHelper *self,
--    GAsyncReadyCallback callback,
--    gpointer user_data);
--
--gboolean empathy_geoclue_helper_start_finish (EmpathyGeoclueHelper *self,
--    GAsyncResult *result,
--    GError **error);
--
--GClueLocation * empathy_geoclue_helper_get_location (
--    EmpathyGeoclueHelper *self);
--
--G_END_DECLS
--
--#endif /* #ifndef __EMPATHY_GEOCLUE_HELPER_H__*/
---- empathy-3.12.6.orig/libempathy-gtk/empathy-location-manager.c
-+++ empathy-3.12.6/libempathy-gtk/empathy-location-manager.c
-@@ -24,11 +24,11 @@
- 
- #include <telepathy-glib/telepathy-glib-dbus.h>
- 
-+#include <geoclue/geoclue-master.h>
- #include <tp-account-widgets/tpaw-time.h>
- 
- #include "empathy-gsettings.h"
- #include "empathy-location.h"
--#include "empathy-geoclue-helper.h"
- 
- #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
- #include "empathy-debug.h"
-@@ -37,16 +37,8 @@
- #define TIMEOUT 10
- static EmpathyLocationManager *location_manager = NULL;
- 
--typedef enum
--{
--  GEOCLUE_NONE = 0,
--  GEOCLUE_STARTING,
--  GEOCLUE_STARTED,
--  GEOCLUE_FAILED,
--} GeoclueStatus;
--
- struct _EmpathyLocationManagerPrivate {
--    GeoclueStatus geoclue_status;
-+    gboolean geoclue_is_setup;
-     /* Contains the location to be sent to accounts.  Geoclue is used
-      * to populate it.  This HashTable uses Telepathy's style (string,
-      * GValue). Keys are defined in empathy-location.h
-@@ -55,9 +47,13 @@ struct _EmpathyLocationManagerPrivate {
- 
-     GSettings *gsettings_loc;
- 
-+    GeoclueResourceFlags resources;
-+    GeoclueMasterClient *gc_client;
-+    GeocluePosition *gc_position;
-+    GeoclueAddress *gc_address;
-+
-     gboolean reduce_accuracy;
-     TpAccountManager *account_manager;
--    EmpathyGeoclueHelper *geoclue;
- 
-     /* The idle id for publish_on_idle func */
-     guint timeout_id;
-@@ -97,6 +93,9 @@ location_manager_dispose (GObject *objec
- 
-   tp_clear_object (&self->priv->account_manager);
-   tp_clear_object (&self->priv->gsettings_loc);
-+  tp_clear_object (&self->priv->gc_client);
-+  tp_clear_object (&self->priv->gc_position);
-+  tp_clear_object (&self->priv->gc_address);
-   tp_clear_pointer (&self->priv->location, g_hash_table_unref);
- 
-   if (dispose != NULL)
-@@ -243,105 +242,333 @@ new_connection_cb (TpAccount *account,
- }
- 
- static void
--update_location (EmpathyLocationManager *self,
--    GClueLocation *proxy)
-+update_timestamp (EmpathyLocationManager *self)
- {
--  gdouble latitude, longitude, accuracy;
--  const gchar *desc;
-   gint64 timestamp;
- 
--  latitude = gclue_location_get_latitude (proxy);
--  longitude = gclue_location_get_longitude (proxy);
--  accuracy = gclue_location_get_accuracy (proxy);
--  desc = gclue_location_get_description (proxy);
--
--  DEBUG ("Location updated: (%f %f) accuracy: %f (%s)",
--      latitude, longitude, accuracy, desc);
--
--  if (self->priv->reduce_accuracy)
--    {
--      /* Truncate at 1 decimal place */
--      latitude = ((int) (latitude * 10)) / 10.0;
--      longitude = ((int) (longitude * 10)) / 10.0;
-+  timestamp = tpaw_time_get_current ();
-+  tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
-+      timestamp);
-+
-+  DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, timestamp);
-+}
-+
-+static void
-+address_changed_cb (GeoclueAddress *address,
-+                    int timestamp,
-+                    GHashTable *details,
-+                    GeoclueAccuracy *accuracy,
-+                    gpointer user_data)
-+{
-+  EmpathyLocationManager *self = user_data;
-+  GeoclueAccuracyLevel level;
-+  GHashTableIter iter;
-+  gpointer key, value;
-+
-+  geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
-+  DEBUG ("New address (accuracy level %d):", level);
-+  /* FIXME: Publish accuracy level also considering the position's */
-+
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_STREET);
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_AREA);
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_REGION);
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_COUNTRY);
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_COUNTRY_CODE);
-+  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_POSTAL_CODE);
-+
-+  if (g_hash_table_size (details) == 0)
-+    {
-+      DEBUG ("\t - (Empty)");
-+      return;
-+    }
-+
-+  g_hash_table_iter_init (&iter, details);
-+  while (g_hash_table_iter_next (&iter, &key, &value))
-+    {
-+      /* Discard street information if reduced accuracy is on */
-+      if (self->priv->reduce_accuracy &&
-+          !tp_strdiff (key, EMPATHY_LOCATION_STREET))
-+        continue;
-+
-+      tp_asv_set_string (self->priv->location, key, value);
-+
-+      DEBUG ("\t - %s: %s", (gchar *) key, (gchar *) value);
-+    }
-+
-+  update_timestamp (self);
-+  if (self->priv->timeout_id == 0)
-+    self->priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle,
-+        self);
-+}
-+
-+static void
-+initial_address_cb (GeoclueAddress *address,
-+                    int timestamp,
-+                    GHashTable *details,
-+                    GeoclueAccuracy *accuracy,
-+                    GError *error,
-+                    gpointer self)
-+{
-+  if (error)
-+    {
-+      DEBUG ("Error: %s", error->message);
-+      g_error_free (error);
-     }
-   else
-     {
--      /* Include the description only if we are not asked to reduce the
--       * accuracy as it can contains a pretty specific description of the
--       * location. */
--      tp_asv_set_string (self->priv->location, EMPATHY_LOCATION_DESCRIPTION,
--          desc);
-+      address_changed_cb (address, timestamp, details, accuracy, self);
-     }
-+}
- 
--  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LAT, latitude);
--  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LON, longitude);
--  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ACCURACY, accuracy);
-+static void
-+position_changed_cb (GeocluePosition *position,
-+                     GeocluePositionFields fields,
-+                     int timestamp,
-+                     double latitude,
-+                     double longitude,
-+                     double altitude,
-+                     GeoclueAccuracy *accuracy,
-+                     gpointer user_data)
-+{
-+  EmpathyLocationManager *self = user_data;
-+  GeoclueAccuracyLevel level;
-+  gdouble mean, horizontal, vertical;
- 
--  timestamp = tpaw_time_get_current ();
--  tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
--      timestamp);
-+  geoclue_accuracy_get_details (accuracy, &level, &horizontal, &vertical);
-+  DEBUG ("New position (accuracy level %d)", level);
-+  if (level == GEOCLUE_ACCURACY_LEVEL_NONE)
-+    return;
-+
-+  if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
-+    {
-+
-+      if (self->priv->reduce_accuracy)
-+        /* Truncate at 1 decimal place */
-+        longitude = ((int) (longitude * 10)) / 10.0;
- 
-+      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LON, longitude);
-+
-+      DEBUG ("\t - Longitude: %f", longitude);
-+    }
-+  else
-+    {
-+      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_LON);
-+    }
-+
-+  if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
-+    {
-+      if (self->priv->reduce_accuracy)
-+        /* Truncate at 1 decimal place */
-+        latitude = ((int) (latitude * 10)) / 10.0;
-+
-+      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LAT, latitude);
-+
-+      DEBUG ("\t - Latitude: %f", latitude);
-+    }
-+  else
-+    {
-+      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_LAT);
-+    }
-+
-+  if (fields & GEOCLUE_POSITION_FIELDS_ALTITUDE)
-+    {
-+      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ALT, altitude);
-+
-+      DEBUG ("\t - Altitude: %f", altitude);
-+    }
-+  else
-+    {
-+      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_ALT);
-+    }
-+
-+  if (level == GEOCLUE_ACCURACY_LEVEL_DETAILED)
-+    {
-+      mean = (horizontal + vertical) / 2.0;
-+      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ACCURACY, mean);
-+
-+      DEBUG ("\t - Accuracy: %f", mean);
-+    }
-+  else
-+    {
-+      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_ACCURACY);
-+    }
-+
-+  update_timestamp (self);
-   if (self->priv->timeout_id == 0)
-     self->priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle,
-         self);
- }
- 
- static void
--location_changed_cb (EmpathyGeoclueHelper *geoclue,
--    GClueLocation *location,
--    EmpathyLocationManager *self)
-+initial_position_cb (GeocluePosition *position,
-+                     GeocluePositionFields fields,
-+                     int timestamp,
-+                     double latitude,
-+                     double longitude,
-+                     double altitude,
-+                     GeoclueAccuracy *accuracy,
-+                     GError *error,
-+                     gpointer self)
- {
--  update_location (self, location);
-+  if (error)
-+    {
-+      DEBUG ("Error: %s", error->message);
-+      g_error_free (error);
-+    }
-+  else
-+    {
-+      position_changed_cb (position, fields, timestamp, latitude, longitude,
-+          altitude, accuracy, self);
-+    }
- }
- 
- static void
--geoclue_new_cb (GObject *source,
--    GAsyncResult *result,
--    gpointer user_data)
-+set_requirements (EmpathyLocationManager *self,
-+    GeoclueSetRequirementsCallback callback)
- {
--  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
--  GError *error = NULL;
--  GClueLocation *location;
-+  geoclue_master_client_set_requirements_async (self->priv->gc_client,
-+      GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, FALSE, self->priv->resources,
-+      callback, self);
-+}
-+
-+static void
-+update_resources_set_requirements_cb (GeoclueMasterClient *client,
-+    GError *error,
-+    gpointer userdata)
-+{
-+  EmpathyLocationManager *self = userdata;
- 
--  self->priv->geoclue = empathy_geoclue_helper_new_started_finish (result,
--      &error);
-+  if (error != NULL)
-+    {
-+      DEBUG ("set_requirements failed: %s", error->message);
-+      g_error_free (error);
-+      return;
-+    }
- 
--  if (self->priv->geoclue == NULL)
-+  geoclue_address_get_address_async (self->priv->gc_address,
-+      initial_address_cb, self);
-+  geoclue_position_get_position_async (self->priv->gc_position,
-+      initial_position_cb, self);
-+}
-+
-+static void
-+update_resources (EmpathyLocationManager *self)
-+{
-+  DEBUG ("Updating resources %d", self->priv->resources);
-+
-+  if (!self->priv->geoclue_is_setup)
-+    return;
-+
-+  /* As per Geoclue bug #15126, using NONE results in no address
-+   * being found as geoclue-manual report an empty address with
-+   * accuracy = NONE */
-+  set_requirements (self, update_resources_set_requirements_cb);
-+}
-+
-+static void
-+create_address_cb (GeoclueMasterClient *client,
-+    GeoclueAddress *address,
-+    GError *error,
-+    gpointer userdata)
-+{
-+  EmpathyLocationManager *self = userdata;
-+
-+  if (error != NULL)
-     {
--      DEBUG ("Failed to create Geoclue client: %s", error->message);
-+      DEBUG ("Failed to create GeoclueAddress: %s", error->message);
-       g_error_free (error);
--      self->priv->geoclue_status = GEOCLUE_FAILED;
-       return;
-     }
- 
--  self->priv->geoclue_status = GEOCLUE_STARTED;
-+  self->priv->gc_address = address;
- 
--  g_signal_connect_object (self->priv->geoclue, "location-changed",
--      G_CALLBACK (location_changed_cb), self, 0);
-+  g_signal_connect (G_OBJECT (self->priv->gc_address), "address-changed",
-+      G_CALLBACK (address_changed_cb), self);
- 
--  location = empathy_geoclue_helper_get_location (self->priv->geoclue);
--  if (location != NULL)
--    update_location (self, location);
-+  self->priv->geoclue_is_setup = TRUE;
- }
- 
- static void
--setup_geoclue (EmpathyLocationManager *self)
-+create_position_cb (GeoclueMasterClient *client,
-+    GeocluePosition *position,
-+    GError *error,
-+    gpointer userdata)
-+{
-+  EmpathyLocationManager *self = userdata;
-+
-+  if (error != NULL)
-+    {
-+      DEBUG ("Failed to create GeocluePosition: %s", error->message);
-+      g_error_free (error);
-+      return;
-+    }
-+
-+  self->priv->gc_position = position;
-+
-+  g_signal_connect (G_OBJECT (self->priv->gc_position), "position-changed",
-+      G_CALLBACK (position_changed_cb), self);
-+
-+  /* Get updated when the address changes */
-+  geoclue_master_client_create_address_async (self->priv->gc_client,
-+      create_address_cb, self);
-+}
-+
-+static void
-+create_client_set_requirements_cb (GeoclueMasterClient *client,
-+    GError *error,
-+    gpointer userdata)
-+{
-+  EmpathyLocationManager *self = userdata;
-+
-+  if (error != NULL)
-+    {
-+      DEBUG ("set_requirements failed: %s", error->message);
-+      g_error_free (error);
-+      return;
-+    }
-+
-+  /* Get updated when the position is changes */
-+  geoclue_master_client_create_position_async (self->priv->gc_client,
-+      create_position_cb, self);
-+}
-+
-+static void
-+create_client_cb (GeoclueMaster *master,
-+    GeoclueMasterClient *client,
-+    char *object_path,
-+    GError *error,
-+    gpointer userdata)
- {
--  switch (self->priv->geoclue_status)
-+  EmpathyLocationManager *self = userdata;
-+
-+  if (error != NULL)
-     {
--      case GEOCLUE_NONE:
--        g_assert (self->priv->geoclue == NULL);
--        self->priv->geoclue_status = GEOCLUE_STARTING;
--        empathy_geoclue_helper_new_started_async (0, geoclue_new_cb, self);
--        break;
--      case GEOCLUE_STARTED:
--      case GEOCLUE_STARTING:
--      case GEOCLUE_FAILED:
-+      DEBUG ("Failed to create GeoclueMasterClient: %s", error->message);
-+      g_error_free (error);
-       return;
-     }
-+
-+  /* @client seems be (transfer full) looking at the geoclue code; yeah for
-+   * undocumented API... */
-+  self->priv->gc_client = client;
-+
-+  set_requirements (self, create_client_set_requirements_cb);
- }
- 
- static void
-+setup_geoclue (EmpathyLocationManager *self)
-+{
-+  GeoclueMaster *master;
-+
-+  DEBUG ("Setting up Geoclue");
-+  master = geoclue_master_get_default ();
-+
-+  geoclue_master_create_client_async (master, create_client_cb, self);
-+
-+  g_object_unref (master);
-+ }
-+
-+static void
- publish_cb (GSettings *gsettings_loc,
-             const gchar *key,
-             gpointer user_data)
-@@ -352,7 +579,16 @@ publish_cb (GSettings *gsettings_loc,
- 
-   if (g_settings_get_boolean (gsettings_loc, key))
-     {
--      setup_geoclue (self);
-+      if (!self->priv->geoclue_is_setup)
-+        setup_geoclue (self);
-+      /* if still not setup than the init failed */
-+      if (!self->priv->geoclue_is_setup)
-+        return;
-+
-+      geoclue_address_get_address_async (self->priv->gc_address,
-+          initial_address_cb, self);
-+      geoclue_position_get_position_async (self->priv->gc_position,
-+          initial_position_cb, self);
-     }
-   else
-     {
-@@ -361,10 +597,54 @@ publish_cb (GSettings *gsettings_loc,
-        */
-       g_hash_table_remove_all (self->priv->location);
-       publish_to_all_connections (self, TRUE);
--
--      g_clear_object (&self->priv->geoclue);
--      self->priv->geoclue_status = GEOCLUE_NONE;
-     }
-+
-+}
-+
-+static void
-+resource_cb (GSettings *gsettings_loc,
-+             const gchar *key,
-+             gpointer user_data)
-+{
-+  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
-+  GeoclueResourceFlags resource = 0;
-+
-+  DEBUG ("%s changed", key);
-+
-+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK))
-+    resource = GEOCLUE_RESOURCE_NETWORK;
-+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL))
-+    resource = GEOCLUE_RESOURCE_CELL;
-+  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS))
-+    resource = GEOCLUE_RESOURCE_GPS;
-+
-+  if (g_settings_get_boolean (gsettings_loc, key))
-+    self->priv->resources |= resource;
-+  else
-+    self->priv->resources &= ~resource;
-+
-+  if (self->priv->geoclue_is_setup)
-+    update_resources (self);
-+}
-+
-+static void
-+accuracy_cb (GSettings *gsettings_loc,
-+             const gchar *key,
-+             gpointer user_data)
-+{
-+  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
-+
-+  DEBUG ("%s changed", key);
-+
-+  self->priv->reduce_accuracy = g_settings_get_boolean (gsettings_loc, key);
-+
-+  if (!self->priv->geoclue_is_setup)
-+    return;
-+
-+  geoclue_address_get_address_async (self->priv->gc_address,
-+      initial_address_cb, self);
-+  geoclue_position_get_position_async (self->priv->gc_position,
-+      initial_position_cb, self);
- }
- 
- static void
-@@ -402,6 +682,7 @@ empathy_location_manager_init (EmpathyLo
-       EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPrivate);
- 
-   self->priv = priv;
-+  priv->geoclue_is_setup = FALSE;
-   priv->location = tp_asv_new (NULL, NULL);
-   priv->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA);
- 
-@@ -415,7 +696,25 @@ empathy_location_manager_init (EmpathyLo
-   g_signal_connect (priv->gsettings_loc,
-       "changed::" EMPATHY_PREFS_LOCATION_PUBLISH,
-       G_CALLBACK (publish_cb), self);
-+  g_signal_connect (priv->gsettings_loc,
-+      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
-+      G_CALLBACK (resource_cb), self);
-+  g_signal_connect (priv->gsettings_loc,
-+      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_CELL,
-+      G_CALLBACK (resource_cb), self);
-+  g_signal_connect (priv->gsettings_loc,
-+      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_GPS,
-+      G_CALLBACK (resource_cb), self);
-+  g_signal_connect (priv->gsettings_loc,
-+      "changed::" EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
-+      G_CALLBACK (accuracy_cb), self);
- 
-+  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
-+      self);
-+  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_CELL, self);
-+  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, self);
-+  accuracy_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
-+      self);
-   publish_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_PUBLISH, self);
- }
- 
---- empathy-3.12.6.orig/libempathy/empathy-gsettings.h
-+++ empathy-3.12.6/libempathy/empathy-gsettings.h
-@@ -83,6 +83,9 @@ G_BEGIN_DECLS
- 
- #define EMPATHY_PREFS_LOCATION_SCHEMA EMPATHY_PREFS_SCHEMA ".location"
- #define EMPATHY_PREFS_LOCATION_PUBLISH             "publish"
-+#define EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK    "resource-network"
-+#define EMPATHY_PREFS_LOCATION_RESOURCE_CELL       "resource-cell"
-+#define EMPATHY_PREFS_LOCATION_RESOURCE_GPS        "resource-gps"
- #define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     "reduce-accuracy"
- 
- #define EMPATHY_PREFS_LOGGER_SCHEMA "org.freedesktop.Telepathy.Logger"
---- empathy-3.12.6.orig/src/empathy-preferences.c
-+++ empathy-3.12.6/src/empathy-preferences.c
-@@ -191,6 +191,12 @@ preferences_setup_widgets (EmpathyPrefer
- 
- 	BIND_ACTIVE (loc, LOCATION_PUBLISH,
- 		     "checkbutton_location_publish");
-+	BIND_ACTIVE (loc, LOCATION_RESOURCE_NETWORK,
-+		     "checkbutton_location_resource_network");
-+	BIND_ACTIVE (loc, LOCATION_RESOURCE_CELL,
-+		     "checkbutton_location_resource_cell");
-+	BIND_ACTIVE (loc, LOCATION_RESOURCE_GPS,
-+		     "checkbutton_location_resource_gps");
- 	BIND_ACTIVE (loc, LOCATION_REDUCE_ACCURACY,
- 		     "checkbutton_location_reduce_accuracy");
- 
---- empathy-3.12.6.orig/src/empathy-preferences.ui
-+++ empathy-3.12.6/src/empathy-preferences.ui
-@@ -833,6 +833,94 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkFrame" id="frame5">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="label_xalign">0</property>
-+            <property name="shadow_type">none</property>
-+            <child>
-+              <object class="GtkAlignment" id="alignment4">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="top_padding">6</property>
-+                <property name="left_padding">12</property>
-+                <child>
-+                  <object class="GtkBox" id="vbox5">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">False</property>
-+                    <property name="orientation">vertical</property>
-+                    <child>
-+                      <object class="GtkCheckButton" id="checkbutton_location_resource_gps">
-+                        <property name="label" translatable="yes">_GPS</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_action_appearance">False</property>
-+                        <property name="use_underline">True</property>
-+                        <property name="draw_indicator">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkCheckButton" id="checkbutton_location_resource_cell">
-+                        <property name="label" translatable="yes">_Cellphone</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_action_appearance">False</property>
-+                        <property name="use_underline">True</property>
-+                        <property name="active">True</property>
-+                        <property name="draw_indicator">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">1</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkCheckButton" id="checkbutton_location_resource_network">
-+                        <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="receives_default">False</property>
-+                        <property name="use_action_appearance">False</property>
-+                        <property name="use_underline">True</property>
-+                        <property name="active">True</property>
-+                        <property name="draw_indicator">True</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">2</property>
-+                      </packing>
-+                    </child>
-+                  </object>
-+                </child>
-+              </object>
-+            </child>
-+            <child type="label">
-+              <object class="GtkLabel" id="label5">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Location sources:</property>
-+                <attributes>
-+                  <attribute name="weight" value="bold"/>
-+                </attributes>
-+              </object>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">4</property>

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-24 08:32:39 +0000
+++ debian/patches/series	2014-11-08 20:15:08 +0000
@@ -8,4 +8,3 @@
 42_shell_running.patch
 43_quicklists.patch
 ubuntu_launch_uoa_panel.patch
-Revert-geoclue-2.0.patch