[frogr] Don't open browser after upload.

[Mario Sanchez Prada <msanchez src gnome org>]

commit ca1431a41aa6d86081b6c57b543b09d81fce54ad
Author: Mario Sanchez Prada <msanchez igalia com>
Date:   Thu Jan 20 18:02:24 2011 +0100

    Don't open browser after upload.
    
    After adding all the features that come along with Frogr 0.4, such as
    'adding to a new/existing album' or 'adding to groups', this feature
    is no longer needed. Also, some people has already mentioned that this
    is not a very nice feature, so let's drop it.

 src/frogr-config.c          |   39 --------------------------------
 src/frogr-config.h          |    4 ---
 src/frogr-controller.c      |   51 -------------------------------------------
 src/frogr-settings-dialog.c |   35 -----------------------------
 4 files changed, 0 insertions(+), 129 deletions(-)
---
diff --git a/src/frogr-config.c b/src/frogr-config.c
index 88ce558..cc69cc7 100644
--- a/src/frogr-config.c
+++ b/src/frogr-config.c
@@ -56,8 +56,6 @@ struct _FrogrConfigPrivate
   FspSafetyLevel safety_level;
   FspContentType content_type;
 
-  gboolean open_browser_after_upload;
-
   gboolean use_proxy;
   gchar *proxy_host;
   gchar *proxy_port;
@@ -151,20 +149,6 @@ _load_settings (FrogrConfig *self, const gchar *config_dir)
           if (node->type != XML_ELEMENT_NODE)
             continue;
 
-          if (!xmlStrcmp (node->name, (const xmlChar*) "open-browser-after-upload"))
-            {
-              xmlChar *content = NULL;
-
-              content = xmlNodeGetContent (node);
-              if (content)
-                {
-                  priv->open_browser_after_upload =
-                    !xmlStrcmp (content, (const xmlChar*) "1");
-
-                  xmlFree (content);
-                }
-            }
-
           if (!xmlStrcmp (node->name, (const xmlChar*) "default-content-type"))
             {
               xmlChar *content = NULL;
@@ -539,10 +523,6 @@ _save_settings (FrogrConfig *self)
   _xml_add_string_child (root, "default-safety-level", int_string);
   g_free (int_string);
 
-  /* Default actions */
-  _xml_add_string_child (root, "open-browser-after-upload",
-                         priv->open_browser_after_upload ? "1" : "0");
-
   /* Use proxy */
   node = xmlNewNode (NULL, (const xmlChar*) "http-proxy");
   _xml_add_string_child (node, "use-proxy", priv->use_proxy ? "1" : "0");
@@ -765,7 +745,6 @@ frogr_config_init (FrogrConfig *self)
   priv->show_in_search = TRUE;
   priv->safety_level = FSP_SAFETY_LEVEL_SAFE;
   priv->content_type = FSP_CONTENT_TYPE_PHOTO;
-  priv->open_browser_after_upload = TRUE;
 
   priv->use_proxy = FALSE;
   priv->proxy_host = NULL;
@@ -1030,24 +1009,6 @@ frogr_config_get_default_show_in_search (FrogrConfig *self)
 }
 
 void
-frogr_config_set_open_browser_after_upload (FrogrConfig *self, gboolean value)
-{
-  g_return_if_fail (FROGR_IS_CONFIG (self));
-
-  FrogrConfigPrivate * priv = FROGR_CONFIG_GET_PRIVATE (self);
-  priv->open_browser_after_upload = value;
-}
-
-gboolean
-frogr_config_get_open_browser_after_upload (FrogrConfig *self)
-{
-  g_return_val_if_fail (FROGR_IS_CONFIG (self), FALSE);
-
-  FrogrConfigPrivate *priv = FROGR_CONFIG_GET_PRIVATE (self);
-  return priv->open_browser_after_upload;
-}
-
-void
 frogr_config_set_use_proxy (FrogrConfig *self, gboolean value)
 {
   g_return_if_fail (FROGR_IS_CONFIG (self));
diff --git a/src/frogr-config.h b/src/frogr-config.h
index 6dab2c1..732d573 100644
--- a/src/frogr-config.h
+++ b/src/frogr-config.h
@@ -101,10 +101,6 @@ void frogr_config_set_default_show_in_search (FrogrConfig *self, gboolean value)
 
 gboolean frogr_config_get_default_show_in_search (FrogrConfig *self);
 
-void frogr_config_set_open_browser_after_upload (FrogrConfig *self, gboolean value);
-
-gboolean frogr_config_get_open_browser_after_upload (FrogrConfig *self);
-
 void frogr_config_set_use_proxy (FrogrConfig *self, gboolean value);
 
 gboolean frogr_config_get_use_proxy (FrogrConfig *self);
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 65b45c3..d053acd 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -176,8 +176,6 @@ static void _on_picture_uploaded (FrogrController *self, FrogrPicture *picture);
 static void _on_pictures_uploaded (FrogrController *self,
                                    GError *error);
 
-static void _open_browser_to_edit_details (FrogrController *self);
-
 static void _fetch_everything (FrogrController *self);
 
 static void _fetch_sets (FrogrController *self);
@@ -974,9 +972,6 @@ _on_pictures_uploaded (FrogrController *self,
       FrogrControllerPrivate *priv = NULL;
       priv = FROGR_CONTROLLER_GET_PRIVATE (self);
 
-      if (frogr_config_get_open_browser_after_upload (priv->config))
-        _open_browser_to_edit_details (self);
-
       /* Fetch sets and tags right after finishing */
       _fetch_sets (self);
       _fetch_tags (self);
@@ -996,52 +991,6 @@ _on_pictures_uploaded (FrogrController *self,
 }
 
 static void
-_open_browser_to_edit_details (FrogrController *self)
-{
-  FrogrControllerPrivate *priv;
-  FrogrMainViewModel *mainview_model = NULL;
-  GSList *pictures;
-  GSList *item;
-  guint index;
-  guint n_pictures;
-  gchar **str_array;
-  gchar *ids_str;
-  gchar *edition_url;
-  const gchar *id;
-
-  priv = FROGR_CONTROLLER_GET_PRIVATE (self);
-  mainview_model = frogr_main_view_get_model (priv->mainview);
-
-  pictures = frogr_main_view_model_get_pictures (mainview_model);
-  n_pictures = frogr_main_view_model_n_pictures (mainview_model);
-
-  /* Build the photo edition url */
-  str_array = g_new (gchar*, n_pictures + 1);
-
-  index = 0;
-  for (item = pictures; item; item = g_slist_next (item))
-    {
-      id = frogr_picture_get_id (FROGR_PICTURE (item->data));
-      if (id != NULL)
-        str_array[index++] = g_strdup (id);
-    }
-  str_array[index] = NULL;
-
-  ids_str = g_strjoinv (",", str_array);
-  edition_url =
-    g_strdup_printf ("http://www.flickr.com/tools/uploader_edit.gne?ids=%s";,
-                     ids_str);
-  g_debug ("Opening edition url: %s", edition_url);
-
-  /* Redirect to URL for setting more properties about the pictures */
-  frogr_util_open_url_in_browser (edition_url);
-
-  g_free (edition_url);
-  g_free (ids_str);
-  g_strfreev (str_array);
-}
-
-static void
 _fetch_everything (FrogrController *self)
 {
   g_return_if_fail(FROGR_IS_CONTROLLER (self));
diff --git a/src/frogr-settings-dialog.c b/src/frogr-settings-dialog.c
index 724885e..442e3bf 100644
--- a/src/frogr-settings-dialog.c
+++ b/src/frogr-settings-dialog.c
@@ -45,7 +45,6 @@ typedef struct _FrogrSettingsDialogPrivate {
   GtkWidget *private_rb;
   GtkWidget *friend_cb;
   GtkWidget *family_cb;
-  GtkWidget *open_browser_after_upload_cb;
   GtkWidget *show_in_search_cb;
   GtkWidget *photo_content_rb;
   GtkWidget *sshot_content_rb;
@@ -67,7 +66,6 @@ typedef struct _FrogrSettingsDialogPrivate {
   gboolean public_visibility;
   gboolean family_visibility;
   gboolean friend_visibility;
-  gboolean open_browser_after_upload;
   gboolean show_in_search;
   FspSafetyLevel safety_level;
   FspContentType content_type;
@@ -268,27 +266,6 @@ _add_general_page (FrogrSettingsDialog *self, GtkNotebook *notebook)
                     G_CALLBACK (_on_button_toggled),
                     self);
 
-  /* Default Actions */
-
-  label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-  markup = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>",
-                                    _("Default Actions"));
-  gtk_label_set_markup (GTK_LABEL (label), markup);
-  g_free (markup);
-
-  align = gtk_alignment_new (0, 0, 0, 1);
-  gtk_container_add (GTK_CONTAINER (align), label);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 6);
-
-  cbutton = gtk_check_button_new_with_mnemonic (_("Open _Browser after Uploading Pictures"));
-  gtk_box_pack_start (GTK_BOX (vbox), cbutton, FALSE, FALSE, 0);
-  priv->open_browser_after_upload_cb = cbutton;
-
-  g_signal_connect (G_OBJECT (priv->open_browser_after_upload_cb), "toggled",
-                    G_CALLBACK (_on_button_toggled),
-                    self);
-
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
   gtk_notebook_append_page (notebook, vbox, gtk_label_new_with_mnemonic (_("_General")));
 }
@@ -418,7 +395,6 @@ _fill_dialog_with_data (FrogrSettingsDialog *self)
   priv->show_in_search = frogr_config_get_default_show_in_search (priv->config);
   priv->content_type = frogr_config_get_default_content_type (priv->config);
   priv->safety_level = frogr_config_get_default_safety_level (priv->config);
-  priv->open_browser_after_upload = frogr_config_get_open_browser_after_upload (priv->config);
   priv->use_proxy = frogr_config_get_use_proxy (priv->config);
 
   g_free (priv->proxy_host);
@@ -451,8 +427,6 @@ _fill_dialog_with_data (FrogrSettingsDialog *self)
                                 priv->family_visibility);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->friend_cb),
                                 priv->friend_visibility);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->open_browser_after_upload_cb),
-                                priv->open_browser_after_upload);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_in_search_cb),
                                 priv->show_in_search);
 
@@ -503,7 +477,6 @@ _save_data (FrogrSettingsDialog *self)
   frogr_config_set_default_content_type (priv->config, priv->content_type);
   frogr_config_set_default_safety_level (priv->config, priv->safety_level);
 
-  frogr_config_set_open_browser_after_upload (priv->config, priv->open_browser_after_upload);
   frogr_config_set_use_proxy (priv->config, priv->use_proxy);
 
   g_free (priv->proxy_host);
@@ -586,12 +559,6 @@ _on_button_toggled (GtkToggleButton *button, gpointer data)
       g_debug ("friend visibility set to %s", active ? "TRUE" : "FALSE");
     }
 
-  if (GTK_WIDGET (button) == priv->open_browser_after_upload_cb)
-    {
-      priv->open_browser_after_upload = active;
-      g_debug ("Open browser after upload set to %s", active ? "TRUE" : "FALSE");
-    }
-
   if (GTK_WIDGET (button) == priv->show_in_search_cb)
     {
       priv->show_in_search = active;
@@ -749,7 +716,6 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
   priv->private_rb = NULL;
   priv->friend_cb = NULL;
   priv->family_cb = NULL;
-  priv->open_browser_after_upload_cb = NULL;
   priv->show_in_search_cb = NULL;
   priv->photo_content_rb = NULL;
   priv->sshot_content_rb = NULL;
@@ -769,7 +735,6 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
   priv->public_visibility = FALSE;
   priv->family_visibility = FALSE;
   priv->friend_visibility = FALSE;
-  priv->open_browser_after_upload = FALSE;
   priv->show_in_search = FALSE;
   priv->safety_level = FSP_SAFETY_LEVEL_NONE;
   priv->content_type = FSP_CONTENT_TYPE_NONE;