GNOME.org
 

[frogr] Rename option to replace 'date posted' with 'date taken', to avoid confusion

commit 2d789875b32675ae17e7ebbdeda91c43a1d963a5
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sat Oct 11 16:25:00 2014 +0100

    Rename option to replace 'date posted' with 'date taken', to avoid confusion
    
    Changed it from "Set 'Taken Date' as 'Posted Date'" to "Replace 'Date
    Posted' with 'Date Taken'", will hopefully be less confusing. Also,
    renamed internal variables and functions, as well as the name of the
    property in the settings.xml, to reflect the change.

 src/examples/example.c      |   18 ++++++++--------
 src/flicksoup/fsp-session.c |    8 +++---
 src/flicksoup/fsp-session.h |    4 +-
 src/frogr-config.c          |   18 ++++++++--------
 src/frogr-config.h          |    4 +-
 src/frogr-controller.c      |   46 +++++++++++++++++++++---------------------
 src/frogr-details-dialog.c  |   38 +++++++++++++++++-----------------
 src/frogr-file-loader.c     |    6 ++--
 src/frogr-picture.c         |   32 +++++++++++++++---------------
 src/frogr-picture.h         |    4 +-
 src/frogr-settings-dialog.c |   26 ++++++++++++------------
 11 files changed, 102 insertions(+), 102 deletions(-)
---
diff --git a/src/examples/example.c b/src/examples/example.c
index ab853eb..e1e8e75 100644
--- a/src/examples/example.c
+++ b/src/examples/example.c
@@ -44,7 +44,7 @@ void added_to_photoset_cb (GObject *object, GAsyncResult *res, gpointer unused);
 void photoset_created_cb (GObject *object, GAsyncResult *res, gpointer unused);
 void get_photosets_cb (GObject *object, GAsyncResult *res, gpointer unused);
 void photo_get_info_cb (GObject *object, GAsyncResult *res, gpointer unused);
-void set_posted_date_cb (GObject *object, GAsyncResult *res, gpointer user_data);
+void set_date_posted_cb (GObject *object, GAsyncResult *res, gpointer user_data);
 void get_location_cb (GObject *object, GAsyncResult *res, gpointer unused);
 void set_location_cb (GObject *object, GAsyncResult *res, gpointer unused);
 void set_license_cb (GObject *object, GAsyncResult *res, gpointer unused);
@@ -374,7 +374,7 @@ photo_get_info_cb                       (GObject      *object,
 }
 
 void
-set_posted_date_cb                      (GObject      *object,
+set_date_posted_cb                      (GObject      *object,
                                          GAsyncResult *res,
                                          gpointer      user_data)
 {
@@ -382,15 +382,15 @@ set_posted_date_cb                      (GObject      *object,
   GError *error = NULL;
   gboolean result = FALSE;
 
-  result = fsp_session_set_posted_date_finish (session, res, &error);
+  result = fsp_session_set_date_posted_finish (session, res, &error);
   if (error != NULL)
     {
-      g_print ("Error setting the posted date: %s\n", error->message);
+      g_print ("Error setting the date posted: %s\n", error->message);
       g_error_free (error);
     }
   else
     {
-      g_print ("[set_posted_date_cb]::Success! (%s)\n\n",
+      g_print ("[set_date_posted_cb]::Success! (%s)\n\n",
                result ? "OK" : "FAIL");
 
       /* Make a pause before continuing */
@@ -434,13 +434,13 @@ get_location_cb                         (GObject      *object,
       g_print ("Press ENTER to continue...\n\n");
       getchar ();
 
-      /* Continue setting the posted date to one year ago */
+      /* Continue setting the date posted to one year ago */
       date_now = g_date_time_new_now_local ();
       date = g_date_time_add_years (date_now, -1);
       date_str = g_date_time_format (date, "%Y-%m-%d %H:%M:%S");
-      g_print ("Setting posted date for photo %s to %s...\n", uploaded_photo_id, date_str);
-      fsp_session_set_posted_date (session, uploaded_photo_id, date, NULL,
-                                   set_posted_date_cb, NULL);
+      g_print ("Setting date posted for photo %s to %s...\n", uploaded_photo_id, date_str);
+      fsp_session_set_date_posted (session, uploaded_photo_id, date, NULL,
+                                   set_date_posted_cb, NULL);
 
       g_free (date_str);
       g_date_time_unref (date);
diff --git a/src/flicksoup/fsp-session.c b/src/flicksoup/fsp-session.c
index ab2234e..7017ff0 100644
--- a/src/flicksoup/fsp-session.c
+++ b/src/flicksoup/fsp-session.c
@@ -2726,7 +2726,7 @@ fsp_session_get_location_finish          (FspSession    *self,
 }
 
 void
-fsp_session_set_posted_date             (FspSession          *self,
+fsp_session_set_date_posted             (FspSession          *self,
                                          const gchar         *photo_id,
                                          GDateTime           *date,
                                          GCancellable        *cancellable,
@@ -2758,14 +2758,14 @@ fsp_session_set_posted_date             (FspSession          *self,
   soup_session = _get_soup_session (self);
   _perform_async_request (soup_session, url,
                           _set_dates_soup_session_cb, G_OBJECT (self),
-                          cancellable, callback, fsp_session_set_posted_date, data);
+                          cancellable, callback, fsp_session_set_date_posted, data);
 
   g_free (date_str);
   g_free (url);
 }
 
 gboolean
-fsp_session_set_posted_date_finish      (FspSession    *self,
+fsp_session_set_date_posted_finish      (FspSession    *self,
                                          GAsyncResult  *res,
                                          GError       **error)
 {
@@ -2775,7 +2775,7 @@ fsp_session_set_posted_date_finish      (FspSession    *self,
   g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
 
   result = _finish_async_request (G_OBJECT (self), res,
-                                  fsp_session_set_posted_date, error);
+                                  fsp_session_set_date_posted, error);
 
   return result ? TRUE : FALSE;
 }
diff --git a/src/flicksoup/fsp-session.h b/src/flicksoup/fsp-session.h
index 62c53f8..4679b3e 100644
--- a/src/flicksoup/fsp-session.h
+++ b/src/flicksoup/fsp-session.h
@@ -284,7 +284,7 @@ fsp_session_get_location_finish          (FspSession    *self,
                                           GError       **error);
 
 void
-fsp_session_set_posted_date             (FspSession          *self,
+fsp_session_set_date_posted             (FspSession          *self,
                                          const gchar         *photo_id,
                                          GDateTime           *date,
                                          GCancellable        *cancellable,
@@ -292,7 +292,7 @@ fsp_session_set_posted_date             (FspSession          *self,
                                          gpointer             data);
 
 gboolean
-fsp_session_set_posted_date_finish      (FspSession    *self,
+fsp_session_set_date_posted_finish      (FspSession    *self,
                                          GAsyncResult  *res,
                                          GError       **error);
 
diff --git a/src/frogr-config.c b/src/frogr-config.c
index d7d1b83..2a20308 100644
--- a/src/frogr-config.c
+++ b/src/frogr-config.c
@@ -56,7 +56,7 @@ struct _FrogrConfigPrivate
   gboolean friend;
   gboolean send_geolocation_data;
   gboolean show_in_search;
-  gboolean date_taken_as_posted;
+  gboolean replace_date_posted;
 
   FspLicense license;
   FspSafetyLevel safety_level;
@@ -273,10 +273,10 @@ _load_settings (FrogrConfig *self)
                 }
             }
 
-          if (!xmlStrcmp (node->name, (const xmlChar*) "default-date-taken-as-posted"))
+          if (!xmlStrcmp (node->name, (const xmlChar*) "default-replace-date-posted"))
             {
               content = xmlNodeGetContent (node);
-              priv->date_taken_as_posted = !xmlStrcmp (content, (const xmlChar*) "1");
+              priv->replace_date_posted = !xmlStrcmp (content, (const xmlChar*) "1");
             }
 
           if (!xmlStrcmp (node->name, (const xmlChar*) "http-proxy"))
@@ -704,7 +704,7 @@ _save_settings (FrogrConfig *self)
   /* Other defaults */
   _xml_add_bool_child (root, "default-send-geolocation-data", priv->send_geolocation_data);
   _xml_add_bool_child (root, "default-show-in-search", priv->show_in_search);
-  _xml_add_bool_child (root, "default-date-taken-as-posted", priv->date_taken_as_posted);
+  _xml_add_bool_child (root, "default-replace-date-posted", priv->replace_date_posted);
 
   /* Other stuff */
   _xml_add_bool_child (root, "tags-autocompletion", priv->tags_autocompletion);
@@ -987,7 +987,7 @@ frogr_config_init (FrogrConfig *self)
   priv->mainview_sorting_reversed = FALSE;
   priv->mainview_enable_tooltips = TRUE;
   priv->use_dark_theme = TRUE;
-  priv->date_taken_as_posted = FALSE;
+  priv->replace_date_posted = FALSE;
   priv->use_proxy = FALSE;
   priv->proxy_host = NULL;
   priv->proxy_port = NULL;
@@ -1339,25 +1339,25 @@ frogr_config_get_default_send_geolocation_data (FrogrConfig *self)
 }
 
 void
-frogr_config_set_default_date_taken_as_posted (FrogrConfig *self, gboolean value)
+frogr_config_set_default_replace_date_posted (FrogrConfig *self, gboolean value)
 {
   FrogrConfigPrivate * priv = NULL;
 
   g_return_if_fail (FROGR_IS_CONFIG (self));
 
   priv = FROGR_CONFIG_GET_PRIVATE (self);
-  priv->date_taken_as_posted = value;
+  priv->replace_date_posted = value;
 }
 
 gboolean
-frogr_config_get_default_date_taken_as_posted (FrogrConfig *self)
+frogr_config_get_default_replace_date_posted (FrogrConfig *self)
 {
   FrogrConfigPrivate *priv = NULL;
 
   g_return_val_if_fail (FROGR_IS_CONFIG (self), FALSE);
 
   priv = FROGR_CONFIG_GET_PRIVATE (self);
-  return priv->date_taken_as_posted;
+  return priv->replace_date_posted;
 }
 
 void
diff --git a/src/frogr-config.h b/src/frogr-config.h
index a430abd..759c1ec 100644
--- a/src/frogr-config.h
+++ b/src/frogr-config.h
@@ -121,9 +121,9 @@ void frogr_config_set_default_send_geolocation_data (FrogrConfig *self, gboolean
 
 gboolean frogr_config_get_default_send_geolocation_data (FrogrConfig *self);
 
-void frogr_config_set_default_date_taken_as_posted (FrogrConfig *self, gboolean value);
+void frogr_config_set_default_replace_date_posted (FrogrConfig *self, gboolean value);
 
-gboolean frogr_config_get_default_date_taken_as_posted (FrogrConfig *self);
+gboolean frogr_config_get_default_replace_date_posted (FrogrConfig *self);
 
 void frogr_config_set_tags_autocompletion (FrogrConfig *self, gboolean value);
 
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index aaf7c78..272233a 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -81,7 +81,7 @@ struct _FrogrControllerPrivate
   gboolean fetching_tags;
   gboolean setting_license;
   gboolean setting_location;
-  gboolean setting_date_taken_as_posted;
+  gboolean setting_replace_date_posted;
   gboolean adding_to_set;
   gboolean adding_to_group;
 
@@ -112,7 +112,7 @@ static FrogrController *_instance = NULL;
 typedef enum {
   AFTER_UPLOAD_OP_SETTING_LICENSE,
   AFTER_UPLOAD_OP_SETTING_LOCATION,
-  AFTER_UPLOAD_OP_SETTING_DATE_TAKEN_AS_POSTED,
+  AFTER_UPLOAD_OP_SETTING_REPLACE_DATE_POSTED,
   AFTER_UPLOAD_OP_ADDING_TO_SET,
   AFTER_UPLOAD_OP_ADDING_TO_GROUP,
   N_AFTER_UPLOAD_OPS
@@ -229,9 +229,9 @@ static void _set_location_cb (GObject *object, GAsyncResult *res, gpointer data)
 
 static void _set_location_for_picture (FrogrController *self, UploadOnePictureData *uop_data);
 
-static void _set_date_taken_as_posted_cb (GObject *object, GAsyncResult *res, gpointer data);
+static void _set_replace_date_posted_cb (GObject *object, GAsyncResult *res, gpointer data);
 
-static void _set_date_taken_as_posted_for_picture (FrogrController *self, UploadOnePictureData *uop_data);
+static void _set_replace_date_posted_for_picture (FrogrController *self, UploadOnePictureData *uop_data);
 
 static gboolean _add_picture_to_photosets_or_create (FrogrController *self, UploadOnePictureData *uop_data);
 
@@ -1188,10 +1188,10 @@ _perform_after_upload_operations (FrogrController *controller, UploadOnePictureD
       _set_location_for_picture (controller, uop_data);
     }
 
-  if (frogr_picture_date_taken_as_posted (uop_data->picture))
+  if (frogr_picture_replace_date_posted (uop_data->picture))
     {
-      uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_DATE_TAKEN_AS_POSTED] = 0;
-      _set_date_taken_as_posted_for_picture (controller, uop_data);
+      uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_REPLACE_DATE_POSTED] = 0;
+      _set_replace_date_posted_for_picture (controller, uop_data);
     }
 
   if (frogr_picture_get_photosets (uop_data->picture))
@@ -1346,7 +1346,7 @@ _set_location_for_picture (FrogrController *self, UploadOnePictureData *uop_data
 }
 
 static void
-_set_date_taken_as_posted_cb (GObject *object, GAsyncResult *res, gpointer data)
+_set_replace_date_posted_cb (GObject *object, GAsyncResult *res, gpointer data)
 {
   FspSession *session = NULL;
   UploadOnePictureData *uop_data = NULL;
@@ -1357,34 +1357,34 @@ _set_date_taken_as_posted_cb (GObject *object, GAsyncResult *res, gpointer data)
   uop_data = (UploadOnePictureData*) data;
   controller = uop_data->controller;
 
-  fsp_session_set_posted_date_finish (session, res, &error);
-  if (error && _should_retry_operation (error, 
uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_DATE_TAKEN_AS_POSTED]))
+  fsp_session_set_date_posted_finish (session, res, &error);
+  if (error && _should_retry_operation (error, 
uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_REPLACE_DATE_POSTED]))
     {
-      uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_DATE_TAKEN_AS_POSTED]++;
+      uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_REPLACE_DATE_POSTED]++;
 
-      DEBUG("Error setting 'date taken' as 'posted' for picture %s: %s. Retrying... (attempt %d / %d)",
+      DEBUG("Error replacing 'date posted' with 'date taken' for picture %s: %s. Retrying... (attempt %d / 
%d)",
             frogr_picture_get_title (uop_data->picture),
             error->message,
-            uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_DATE_TAKEN_AS_POSTED],
+            uop_data->after_upload_attempts[AFTER_UPLOAD_OP_SETTING_REPLACE_DATE_POSTED],
             MAX_ATTEMPTS);
       g_error_free (error);
 
-      _set_date_taken_as_posted_for_picture (controller, uop_data);
+      _set_replace_date_posted_for_picture (controller, uop_data);
     }
   else
     {
       if (error)
         {
-          DEBUG ("Error setting 'date taken' as 'posted' for picture: %s", error->message);
+          DEBUG ("Error replacing 'date posted' with 'date taken' for picture: %s", error->message);
           uop_data->up_data->error = error;
         }
 
-      FROGR_CONTROLLER_GET_PRIVATE (controller)->setting_date_taken_as_posted = FALSE;
+      FROGR_CONTROLLER_GET_PRIVATE (controller)->setting_replace_date_posted = FALSE;
     }
 }
 
 static void
-_set_date_taken_as_posted_for_picture (FrogrController *self, UploadOnePictureData *uop_data)
+_set_replace_date_posted_for_picture (FrogrController *self, UploadOnePictureData *uop_data)
 {
   FrogrControllerPrivate *priv = NULL;
   FrogrPicture *picture = NULL;
@@ -1425,16 +1425,16 @@ _set_date_taken_as_posted_for_picture (FrogrController *self, UploadOnePictureDa
     return;
 
   priv = FROGR_CONTROLLER_GET_PRIVATE (self);
-  priv->setting_date_taken_as_posted = TRUE;
+  priv->setting_replace_date_posted = TRUE;
 
-  fsp_session_set_posted_date (priv->session,
+  fsp_session_set_date_posted (priv->session,
                                frogr_picture_get_id (picture),
                                picture_date,
                                uop_data->cancellable,
-                               _set_date_taken_as_posted_cb,
+                               _set_replace_date_posted_cb,
                                uop_data);
 
-  debug_msg = g_strdup_printf ("Setting 'date taken' as 'posted' (%s) for picture %s…",
+  debug_msg = g_strdup_printf ("Replacing 'date posted' with 'date taken' (%s) for picture %s…",
                                date_iso8601, frogr_picture_get_title (picture));
   DEBUG ("%s", debug_msg);
   g_free (debug_msg);
@@ -1745,7 +1745,7 @@ _complete_picture_upload_on_idle (gpointer data)
 
   /* Keep the source while busy */
   priv = FROGR_CONTROLLER_GET_PRIVATE (controller);
-  if (priv->setting_license || priv->setting_location || priv->setting_date_taken_as_posted
+  if (priv->setting_license || priv->setting_location || priv->setting_replace_date_posted
       || priv->adding_to_set || priv->adding_to_group)
     {
       frogr_main_view_pulse_progress (priv->mainview);
@@ -2616,7 +2616,7 @@ frogr_controller_init (FrogrController *self)
   priv->fetching_tags = FALSE;
   priv->setting_license = FALSE;
   priv->setting_location = FALSE;
-  priv->setting_date_taken_as_posted = FALSE;
+  priv->setting_replace_date_posted = FALSE;
   priv->adding_to_set = FALSE;
   priv->adding_to_group = FALSE;
   priv->photosets_fetched = FALSE;
diff --git a/src/frogr-details-dialog.c b/src/frogr-details-dialog.c
index 2497993..a575177 100644
--- a/src/frogr-details-dialog.c
+++ b/src/frogr-details-dialog.c
@@ -59,7 +59,7 @@ typedef struct _FrogrDetailsDialogPrivate {
   GtkWidget *family_cb;
   GtkWidget *show_in_search_cb;
   GtkWidget *send_location_cb;
-  GtkWidget *date_taken_as_posted_cb;
+  GtkWidget *replace_date_posted_cb;
   GtkWidget *license_cb;
   GtkWidget *photo_content_rb;
   GtkWidget *sshot_content_rb;
@@ -386,9 +386,9 @@ _create_widgets (FrogrDetailsDialog *self)
   gtk_box_pack_start (GTK_BOX (section_vbox), widget, FALSE, FALSE, 0);
   priv->send_location_cb = widget;
 
-  widget = gtk_check_button_new_with_mnemonic (_("Set 'Taken Date' as 'Posted Date'"));
+  widget = gtk_check_button_new_with_mnemonic (_("Replace 'Date Posted' with 'Date Taken'"));
   gtk_box_pack_start (GTK_BOX (section_vbox), widget, FALSE, FALSE, 0);
-  priv->date_taken_as_posted_cb = widget;
+  priv->replace_date_posted_cb = widget;
 
   gtk_box_pack_start (GTK_BOX (vbox), section_vbox, FALSE, FALSE, 0);
 
@@ -416,7 +416,7 @@ _create_widgets (FrogrDetailsDialog *self)
   g_signal_connect (G_OBJECT (priv->send_location_cb), "toggled",
                     G_CALLBACK (_on_toggle_button_toggled), self);
 
-  g_signal_connect (G_OBJECT (priv->date_taken_as_posted_cb), "toggled",
+  g_signal_connect (G_OBJECT (priv->replace_date_posted_cb), "toggled",
                     G_CALLBACK (_on_toggle_button_toggled), self);
 
   g_signal_connect (G_OBJECT (priv->photo_content_rb), "clicked",
@@ -598,7 +598,7 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
   gboolean is_family_val = FALSE;
   gboolean show_in_search_val = FALSE;
   gboolean send_location_val = FALSE;
-  gboolean date_taken_as_posted_val = FALSE;
+  gboolean replace_date_posted_val = FALSE;
   gboolean license_inconsistent = FALSE;
   FspLicense license_val = FSP_LICENSE_NONE;
   FspSafetyLevel safety_level_val = FSP_SAFETY_LEVEL_NONE;
@@ -616,7 +616,7 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
   is_family_val = frogr_picture_is_family (picture);
   show_in_search_val = frogr_picture_show_in_search (picture);
   send_location_val = frogr_picture_send_location (picture);
-  date_taken_as_posted_val = frogr_picture_date_taken_as_posted (picture);
+  replace_date_posted_val = frogr_picture_replace_date_posted (picture);
   license_val = frogr_picture_get_license (picture);
   safety_level_val = frogr_picture_get_safety_level (picture);
   content_type_val = frogr_picture_get_content_type (picture);
@@ -632,7 +632,7 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
       gboolean is_family = FALSE;
       gboolean show_in_search = FALSE;
       gboolean send_location = FALSE;
-      gboolean date_taken_as_posted = FALSE;
+      gboolean replace_date_posted = FALSE;
       FspLicense license = FSP_LICENSE_NONE;
       FspSafetyLevel safety_level = FSP_SAFETY_LEVEL_NONE;
       FspContentType content_type = FSP_CONTENT_TYPE_NONE;
@@ -654,7 +654,7 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
       is_family = frogr_picture_is_family (picture);
       show_in_search = frogr_picture_show_in_search (picture);
       send_location = frogr_picture_send_location (picture);
-      date_taken_as_posted = frogr_picture_date_taken_as_posted (picture);
+      replace_date_posted = frogr_picture_replace_date_posted (picture);
 
       /* License */
       license = frogr_picture_get_license (picture);
@@ -710,10 +710,10 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
           gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (priv->send_location_cb),
                                               send_location_val != send_location);
         }
-      if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb)))
+      if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb)))
         {
-          gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb),
-                                              date_taken_as_posted_val != date_taken_as_posted);
+          gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb),
+                                              replace_date_posted_val != replace_date_posted);
         }
 
       if (!license_inconsistent && license_val != license)
@@ -763,7 +763,7 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
       is_family_val = is_family;
       show_in_search_val = show_in_search;
       send_location_val = send_location;
-      date_taken_as_posted_val = date_taken_as_posted;
+      replace_date_posted_val = replace_date_posted;
       license_val = license;
       content_type_val = content_type;
       safety_level_val = safety_level;
@@ -802,8 +802,8 @@ _fill_dialog_with_data (FrogrDetailsDialog *self)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_in_search_cb), show_in_search_val);
   if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->send_location_cb)))
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->send_location_cb), send_location_val);
-  if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb)))
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb), 
date_taken_as_posted_val);
+  if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb)))
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb), replace_date_posted_val);
 
   if (license_inconsistent)
     gtk_combo_box_set_active (GTK_COMBO_BOX (priv->license_cb), FSP_LICENSE_LAST + 1);
@@ -892,7 +892,7 @@ _save_data (FrogrDetailsDialog *self)
   gboolean is_family;
   gboolean show_in_search;
   gboolean send_location;
-  gboolean date_taken_as_posted;
+  gboolean replace_date_posted;
   FspLicense license;
   FspSafetyLevel safety_level;
   FspContentType content_type;
@@ -932,8 +932,8 @@ _save_data (FrogrDetailsDialog *self)
     gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->show_in_search_cb));
   send_location =
     gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->send_location_cb));
-  date_taken_as_posted =
-    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb));
+  replace_date_posted =
+    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb));
 
   /* License type (values in the combo are shifted +1) */
   license = gtk_combo_box_get_active (GTK_COMBO_BOX (priv->license_cb)) - 1;
@@ -989,8 +989,8 @@ _save_data (FrogrDetailsDialog *self)
             frogr_picture_set_show_in_search (picture, show_in_search);
           if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->send_location_cb)))
             frogr_picture_set_send_location (picture, send_location);
-          if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb)))
-            frogr_picture_set_date_taken_as_posted (picture, date_taken_as_posted);
+          if (!gtk_toggle_button_get_inconsistent (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb)))
+            frogr_picture_set_replace_date_posted (picture, replace_date_posted);
 
           if (license >= FSP_LICENSE_NONE && license < FSP_LICENSE_LAST)
             frogr_picture_set_license (picture, license);
diff --git a/src/frogr-file-loader.c b/src/frogr-file-loader.c
index fda22ae..e8f1b94 100644
--- a/src/frogr-file-loader.c
+++ b/src/frogr-file-loader.c
@@ -83,7 +83,7 @@ struct _FrogrFileLoaderPrivate
   gboolean friend_visibility;
   gboolean show_in_search;
   gboolean send_location;
-  gboolean date_taken_as_posted;
+  gboolean replace_date_posted;
   FspLicense license;
   FspSafetyLevel safety_level;
   FspContentType content_type;
@@ -552,7 +552,7 @@ _create_new_picture (FrogrFileLoader *self, GFile *file, GdkPixbuf *pixbuf, gboo
 
   frogr_picture_set_show_in_search (picture, priv->show_in_search);
   frogr_picture_set_send_location (picture, priv->send_location);
-  frogr_picture_set_date_taken_as_posted (picture, priv->date_taken_as_posted);
+  frogr_picture_set_replace_date_posted (picture, priv->replace_date_posted);
   frogr_picture_set_license (picture, priv->license);
   frogr_picture_set_content_type (picture, priv->content_type);
   frogr_picture_set_safety_level (picture, priv->safety_level);
@@ -832,7 +832,7 @@ frogr_file_loader_init (FrogrFileLoader *self)
   priv->friend_visibility = frogr_config_get_default_friend (config);
   priv->show_in_search = frogr_config_get_default_show_in_search (config);
   priv->send_location = frogr_config_get_default_send_geolocation_data (config);
-  priv->date_taken_as_posted = frogr_config_get_default_date_taken_as_posted (config);
+  priv->replace_date_posted = frogr_config_get_default_replace_date_posted (config);
   priv->license = frogr_config_get_default_license (config);
   priv->safety_level = frogr_config_get_default_safety_level (config);
   priv->content_type = frogr_config_get_default_content_type (config);
diff --git a/src/frogr-picture.c b/src/frogr-picture.c
index 8327f7b..1956ace 100644
--- a/src/frogr-picture.c
+++ b/src/frogr-picture.c
@@ -59,7 +59,7 @@ struct _FrogrPicturePrivate
   FrogrLocation *location;
   gboolean show_in_search;
   gboolean send_location;
-  gboolean date_taken_as_posted;
+  gboolean replace_date_posted;
 
   gboolean is_video;
 
@@ -89,7 +89,7 @@ enum  {
   PROP_LOCATION,
   PROP_SHOW_IN_SEARCH,
   PROP_SEND_LOCATION,
-  PROP_DATE_TAKEN_AS_POSTED,
+  PROP_REPLACE_DATE_POSTED,
   PROP_IS_VIDEO,
   PROP_FILESIZE,
   PROP_DATETIME,
@@ -457,8 +457,8 @@ _frogr_picture_set_property (GObject *object,
     case PROP_SEND_LOCATION:
       frogr_picture_set_send_location (self, g_value_get_boolean (value));
       break;
-    case PROP_DATE_TAKEN_AS_POSTED:
-      frogr_picture_set_date_taken_as_posted (self, g_value_get_boolean (value));
+    case PROP_REPLACE_DATE_POSTED:
+      frogr_picture_set_replace_date_posted (self, g_value_get_boolean (value));
       break;
     case PROP_IS_VIDEO:
       priv->is_video = g_value_get_boolean (value);
@@ -533,8 +533,8 @@ _frogr_picture_get_property (GObject *object,
     case PROP_SEND_LOCATION:
       g_value_set_boolean (value, priv->send_location);
       break;
-    case PROP_DATE_TAKEN_AS_POSTED:
-      g_value_set_boolean (value, priv->date_taken_as_posted);
+    case PROP_REPLACE_DATE_POSTED:
+      g_value_set_boolean (value, priv->replace_date_posted);
       break;
     case PROP_IS_VIDEO:
       g_value_set_boolean (value, priv->is_video);
@@ -734,11 +734,11 @@ frogr_picture_class_init(FrogrPictureClass *klass)
                                                          FALSE,
                                                          G_PARAM_READWRITE));
   g_object_class_install_property (obj_class,
-                                   PROP_DATE_TAKEN_AS_POSTED,
-                                   g_param_spec_boolean ("date-taken-as-posted",
-                                                         "date-taken-as-posted",
-                                                         "Whether to set the 'taken data' as"
-                                                         "'posted date', after uploading",
+                                   PROP_REPLACE_DATE_POSTED,
+                                   g_param_spec_boolean ("replace-date-posted",
+                                                         "replace-date-posted",
+                                                         "Whether to replace the 'date posted'"
+                                                         "with 'date taken', after uploading",
                                                          FALSE,
                                                          G_PARAM_READWRITE));
   g_object_class_install_property (obj_class,
@@ -804,7 +804,7 @@ frogr_picture_init (FrogrPicture *self)
 
   priv->show_in_search = TRUE;
   priv->send_location = FALSE;
-  priv->date_taken_as_posted = FALSE;
+  priv->replace_date_posted = FALSE;
 
   priv->is_video = FALSE;
 
@@ -1192,25 +1192,25 @@ frogr_picture_set_send_location (FrogrPicture *self, gboolean send_location)
 }
 
 gboolean
-frogr_picture_date_taken_as_posted (FrogrPicture *self)
+frogr_picture_replace_date_posted (FrogrPicture *self)
 {
   FrogrPicturePrivate *priv = NULL;
 
   g_return_val_if_fail(FROGR_IS_PICTURE(self), FALSE);
 
   priv = FROGR_PICTURE_GET_PRIVATE (self);
-  return priv->date_taken_as_posted;
+  return priv->replace_date_posted;
 }
 
 void
-frogr_picture_set_date_taken_as_posted (FrogrPicture *self, gboolean date_taken_as_posted)
+frogr_picture_set_replace_date_posted (FrogrPicture *self, gboolean replace_date_posted)
 {
   FrogrPicturePrivate *priv = NULL;
 
   g_return_if_fail(FROGR_IS_PICTURE(self));
 
   priv = FROGR_PICTURE_GET_PRIVATE (self);
-  priv->date_taken_as_posted = date_taken_as_posted;
+  priv->replace_date_posted = replace_date_posted;
 }
 
 GdkPixbuf *
diff --git a/src/frogr-picture.h b/src/frogr-picture.h
index a5f4162..b16c0bf 100644
--- a/src/frogr-picture.h
+++ b/src/frogr-picture.h
@@ -116,8 +116,8 @@ void frogr_picture_set_show_in_search (FrogrPicture *self,
 gboolean frogr_picture_send_location (FrogrPicture *self);
 void frogr_picture_set_send_location (FrogrPicture *self, gboolean send_location);
 
-gboolean frogr_picture_date_taken_as_posted (FrogrPicture *self);
-void frogr_picture_set_date_taken_as_posted (FrogrPicture *self, gboolean date_taken_as_posted);
+gboolean frogr_picture_replace_date_posted (FrogrPicture *self);
+void frogr_picture_set_replace_date_posted (FrogrPicture *self, gboolean replace_date_posted);
 
 GdkPixbuf *frogr_picture_get_pixbuf (FrogrPicture *self);
 void frogr_picture_set_pixbuf (FrogrPicture *self,
diff --git a/src/frogr-settings-dialog.c b/src/frogr-settings-dialog.c
index b5bfe63..d48c9e4 100644
--- a/src/frogr-settings-dialog.c
+++ b/src/frogr-settings-dialog.c
@@ -46,7 +46,7 @@ typedef struct _FrogrSettingsDialogPrivate {
   GtkWidget *family_cb;
   GtkWidget *show_in_search_cb;
   GtkWidget *send_geolocation_data_cb;
-  GtkWidget *date_taken_as_posted_cb;
+  GtkWidget *replace_date_posted_cb;
   GtkWidget *license_cb;
   GtkWidget *photo_content_rb;
   GtkWidget *sshot_content_rb;
@@ -75,7 +75,7 @@ typedef struct _FrogrSettingsDialogPrivate {
   gboolean friend_visibility;
   gboolean show_in_search;
   gboolean send_geolocation_data;
-  gboolean date_taken_as_posted;
+  gboolean replace_date_posted;
   gboolean enable_tags_autocompletion;
   gboolean keep_file_extensions;
   gboolean import_tags;
@@ -320,8 +320,8 @@ _add_general_page (FrogrSettingsDialog *self, GtkNotebook *notebook)
                         _("Set Geo_location Information for Pictures"),
                         &priv->send_geolocation_data_cb);
   _add_toggleable_item (self, GTK_BOX (box1), NULL, FALSE,
-                        _("Set 'Taken Date' as 'Posted Date' for Pictures"),
-                        &priv->date_taken_as_posted_cb);
+                        _("Replace 'Date Posted' with 'Date Taken' for Pictures"),
+                        &priv->replace_date_posted_cb);
 
   gtk_box_pack_start (GTK_BOX (gbox), box1, FALSE, FALSE, 0);
 
@@ -494,7 +494,7 @@ _fill_dialog_with_data (FrogrSettingsDialog *self)
   priv->friend_visibility = frogr_config_get_default_friend (priv->config);
   priv->show_in_search = frogr_config_get_default_show_in_search (priv->config);
   priv->send_geolocation_data = frogr_config_get_default_send_geolocation_data (priv->config);
-  priv->date_taken_as_posted = frogr_config_get_default_date_taken_as_posted (priv->config);
+  priv->replace_date_posted = frogr_config_get_default_replace_date_posted (priv->config);
   priv->license = frogr_config_get_default_license (priv->config);
   priv->content_type = frogr_config_get_default_content_type (priv->config);
   priv->safety_level = frogr_config_get_default_safety_level (priv->config);
@@ -538,8 +538,8 @@ _fill_dialog_with_data (FrogrSettingsDialog *self)
                                 priv->show_in_search);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->send_geolocation_data_cb),
                                 priv->send_geolocation_data);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->date_taken_as_posted_cb),
-                                priv->date_taken_as_posted);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->replace_date_posted_cb),
+                                priv->replace_date_posted);
 
   if (priv->license >= FSP_LICENSE_NONE && priv->license < FSP_LICENSE_LAST)
     gtk_combo_box_set_active (GTK_COMBO_BOX (priv->license_cb), priv->license + 1);
@@ -599,7 +599,7 @@ _save_data (FrogrSettingsDialog *self)
   frogr_config_set_default_friend (priv->config, priv->friend_visibility);
   frogr_config_set_default_show_in_search (priv->config, priv->show_in_search);
   frogr_config_set_default_send_geolocation_data (priv->config, priv->send_geolocation_data);
-  frogr_config_set_default_date_taken_as_posted (priv->config, priv->date_taken_as_posted);
+  frogr_config_set_default_replace_date_posted (priv->config, priv->replace_date_posted);
 
   frogr_config_set_default_license (priv->config, priv->license);
   frogr_config_set_default_content_type (priv->config, priv->content_type);
@@ -708,10 +708,10 @@ _on_button_toggled (GtkToggleButton *button, gpointer data)
       DEBUG ("Send geolocation data set to %s", active ? "TRUE" : "FALSE");
     }
 
-  if (GTK_WIDGET (button) == priv->date_taken_as_posted_cb)
+  if (GTK_WIDGET (button) == priv->replace_date_posted_cb)
     {
-      priv->date_taken_as_posted = active;
-      DEBUG ("Set '_Taken Date' as 'Posted Date' set to %s", active ? "TRUE" : "FALSE");
+      priv->replace_date_posted = active;
+      DEBUG ("Replace 'Date _Posted' with 'Date Taken' set to %s", active ? "TRUE" : "FALSE");
     }
 
   if (active && GTK_WIDGET (button) == priv->photo_content_rb)
@@ -916,7 +916,7 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
   priv->family_cb = NULL;
   priv->show_in_search_cb = NULL;
   priv->send_geolocation_data_cb = NULL;
-  priv->date_taken_as_posted_cb = NULL;
+  priv->replace_date_posted_cb = NULL;
   priv->license_cb = NULL;
   priv->photo_content_rb = NULL;
   priv->sshot_content_rb = NULL;
@@ -942,7 +942,7 @@ frogr_settings_dialog_init (FrogrSettingsDialog *self)
   priv->friend_visibility = FALSE;
   priv->show_in_search = FALSE;
   priv->send_geolocation_data = FALSE;
-  priv->date_taken_as_posted = TRUE;
+  priv->replace_date_posted = TRUE;
   priv->license = FSP_LICENSE_NONE;
   priv->safety_level = FSP_SAFETY_LEVEL_NONE;
   priv->content_type = FSP_CONTENT_TYPE_NONE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]