[frogr] Actually send location only if the user wants to.

[Mario Sanchez Prada <msanchez src gnome org>]

commit 15845df7f9ad89577fc87e3e1ba4dec656c44de1
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Mon Aug 15 10:53:13 2011 +0200

    Actually send location only if the user wants to.

 src/frogr-controller.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 6108f3d..8f7d531 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -637,8 +637,10 @@ _upload_picture_cb (GObject *object, GAsyncResult *res, gpointer data)
                                          up_st);
         }
 
-      if (frogr_picture_get_location (picture) != NULL)
+      if (frogr_picture_send_location (picture)
+          && frogr_picture_get_location (picture) != NULL)
         {
+          priv->setting_location = TRUE;
           gdk_threads_add_timeout (DEFAULT_TIMEOUT, _set_location_on_idle, up_st);
         }
 
@@ -733,7 +735,6 @@ _set_location_on_idle (gpointer data)
   if (priv->setting_license)
     return TRUE;
 
-  priv->setting_location = TRUE;
   _notify_setting_location (controller, picture);
   fsp_session_set_location_async (priv->session,
                                   frogr_picture_get_id (picture),