[gnome-photos] base-item: Rename save_guess_sizes_async as guess_save_sizes_async

[Debarshi Ray <debarshir src gnome org>]

commit 8e39f59b1d4b209285e635575aa1d1963de61164
Author: Rafael Fonseca <r4f4rfs gmail com>
Date:   Fri Apr 1 18:43:36 2016 +0200

    base-item: Rename save_guess_sizes_async as guess_save_sizes_async
    
    The save_guess_sizes name seems to indicate we are saving the guessed
    sizes somewhere whereas the purpose of the function is to estimate the
    size of the file if it was saved to disk.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=760839

 src/photos-base-item.c     |  256 ++++++++++++++++++++++----------------------
 src/photos-base-item.h     |   22 ++--
 src/photos-export-dialog.c |    4 +-
 3 files changed, 141 insertions(+), 141 deletions(-)
---
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 30daf7f..9151b16 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -850,6 +850,64 @@ photos_base_item_file_query_info (GObject *source_object, GAsyncResult *res, gpo
 }
 
 
+static void
+photos_base_item_guess_save_sizes_from_buffer (GeglBuffer *buffer,
+                                               const gchar *mime_type,
+                                               gsize *out_size,
+                                               gsize *out_size_1,
+                                               GCancellable *cancellable)
+{
+  GeglNode *buffer_source;
+  GeglNode *graph;
+  GeglNode *guess_sizes;
+  gsize sizes[2];
+
+  graph = gegl_node_new ();
+  buffer_source = gegl_node_new_child (graph, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
+
+  if (g_strcmp0 (mime_type, "image/png") == 0)
+    guess_sizes = gegl_node_new_child (graph,
+                                       "operation", "photos:png-guess-sizes",
+                                       "background", FALSE,
+                                       "bitdepth", 8,
+                                       "compression", -1,
+                                       NULL);
+  else
+    guess_sizes = gegl_node_new_child (graph,
+                                       "operation", "photos:jpg-guess-sizes",
+                                       "optimize", FALSE,
+                                       "progressive", FALSE,
+                                       "sampling", TRUE,
+                                       NULL);
+
+  gegl_node_link (buffer_source, guess_sizes);
+  gegl_node_process (guess_sizes);
+
+  gegl_node_get (guess_sizes, "size", &sizes[0], "size-1", &sizes[1], NULL);
+  if (out_size != NULL)
+    *out_size = sizes[0];
+  if (out_size_1 != NULL)
+    *out_size_1 = sizes[1];
+
+  g_object_unref (graph);
+}
+
+
+static void
+photos_base_item_guess_save_sizes_in_thread_func (GTask *task,
+                                                  gpointer source_object,
+                                                  gpointer task_data,
+                                                  GCancellable *cancellable)
+{
+  PhotosBaseItemSaveData *data = (PhotosBaseItemSaveData *) task_data;
+  gsize *sizes;
+
+  sizes = g_malloc0_n (2, sizeof (gsize));
+  photos_base_item_guess_save_sizes_from_buffer (data->buffer, data->type, &sizes[0], &sizes[1], 
cancellable);
+  g_task_return_pointer (task, sizes, g_free);
+}
+
+
 static GeglBuffer *
 photos_base_item_load_buffer (PhotosBaseItem *self, GCancellable *cancellable, GError **error)
 {
@@ -1086,64 +1144,6 @@ photos_base_item_process_idle (gpointer user_data)
 
 
 static void
-photos_base_item_save_guess_sizes_from_buffer (GeglBuffer *buffer,
-                                               const gchar *mime_type,
-                                               gsize *out_size,
-                                               gsize *out_size_1,
-                                               GCancellable *cancellable)
-{
-  GeglNode *buffer_source;
-  GeglNode *graph;
-  GeglNode *guess_sizes;
-  gsize sizes[2];
-
-  graph = gegl_node_new ();
-  buffer_source = gegl_node_new_child (graph, "operation", "gegl:buffer-source", "buffer", buffer, NULL);
-
-  if (g_strcmp0 (mime_type, "image/png") == 0)
-    guess_sizes = gegl_node_new_child (graph,
-                                       "operation", "photos:png-guess-sizes",
-                                       "background", FALSE,
-                                       "bitdepth", 8,
-                                       "compression", -1,
-                                       NULL);
-  else
-    guess_sizes = gegl_node_new_child (graph,
-                                       "operation", "photos:jpg-guess-sizes",
-                                       "optimize", FALSE,
-                                       "progressive", FALSE,
-                                       "sampling", TRUE,
-                                       NULL);
-
-  gegl_node_link (buffer_source, guess_sizes);
-  gegl_node_process (guess_sizes);
-
-  gegl_node_get (guess_sizes, "size", &sizes[0], "size-1", &sizes[1], NULL);
-  if (out_size != NULL)
-    *out_size = sizes[0];
-  if (out_size_1 != NULL)
-    *out_size_1 = sizes[1];
-
-  g_object_unref (graph);
-}
-
-
-static void
-photos_base_item_save_guess_sizes_in_thread_func (GTask *task,
-                                                  gpointer source_object,
-                                                  gpointer task_data,
-                                                  GCancellable *cancellable)
-{
-  PhotosBaseItemSaveData *data = (PhotosBaseItemSaveData *) task_data;
-  gsize *sizes;
-
-  sizes = g_malloc0_n (2, sizeof (gsize));
-  photos_base_item_save_guess_sizes_from_buffer (data->buffer, data->type, &sizes[0], &sizes[1], 
cancellable);
-  g_task_return_pointer (task, sizes, g_free);
-}
-
-
-static void
 photos_base_item_save_metadata_in_thread_func (GTask *task,
                                                gpointer source_object,
                                                gpointer task_data,
@@ -2208,6 +2208,76 @@ photos_base_item_get_width (PhotosBaseItem *self)
 }
 
 
+void
+photos_base_item_guess_save_sizes_async (PhotosBaseItem *self,
+                                         GCancellable *cancellable,
+                                         GAsyncReadyCallback callback,
+                                         gpointer user_data)
+{
+  PhotosBaseItemPrivate *priv;
+  GeglBuffer *buffer;
+  GeglNode *graph;
+  GTask *task;
+  PhotosBaseItemSaveData *data;
+
+  g_return_if_fail (PHOTOS_IS_BASE_ITEM (self));
+  priv = self->priv;
+
+  g_return_if_fail (!priv->collection);
+  g_return_if_fail (priv->edit_graph != NULL);
+  g_return_if_fail (priv->load_graph != NULL);
+  g_return_if_fail (priv->pipeline != NULL);
+  g_return_if_fail (priv->processor != NULL);
+  g_return_if_fail (!gegl_processor_work (priv->processor, NULL));
+
+  graph = photos_pipeline_get_graph (priv->pipeline);
+  buffer = photos_utils_create_buffer_from_node (graph);
+
+  data = photos_base_item_save_data_new (NULL, buffer, priv->mime_type);
+
+  task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_source_tag (task, photos_base_item_guess_save_sizes_async);
+  g_task_set_task_data (task, data, (GDestroyNotify) photos_base_item_save_data_free);
+
+  g_task_run_in_thread (task, photos_base_item_guess_save_sizes_in_thread_func);
+
+  g_object_unref (buffer);
+  g_object_unref (task);
+}
+
+
+gboolean
+photos_base_item_guess_save_sizes_finish (PhotosBaseItem *self,
+                                          GAsyncResult *res,
+                                          gsize *out_size,
+                                          gsize *out_size_1,
+                                          GError **error)
+{
+  GTask *task = G_TASK (res);
+  gboolean ret_val = FALSE;
+  gsize *sizes;
+
+  g_return_val_if_fail (PHOTOS_IS_BASE_ITEM (self), FALSE);
+  g_return_val_if_fail (g_task_is_valid (res, self), FALSE);
+  g_return_val_if_fail (g_task_get_source_tag (task) == photos_base_item_guess_save_sizes_async, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  sizes = g_task_propagate_pointer (task, error);
+  if (g_task_had_error (task))
+    goto out;
+
+  ret_val = TRUE;
+
+  if (out_size != NULL)
+    *out_size = sizes[0];
+  if (out_size_1 != NULL)
+    *out_size_1 = sizes[1];
+
+ out:
+  return ret_val;
+}
+
+
 gboolean
 photos_base_item_is_collection (PhotosBaseItem *self)
 {
@@ -2561,76 +2631,6 @@ photos_base_item_save_finish (PhotosBaseItem *self, GAsyncResult *res, GError **
 
 
 void
-photos_base_item_save_guess_sizes_async (PhotosBaseItem *self,
-                                         GCancellable *cancellable,
-                                         GAsyncReadyCallback callback,
-                                         gpointer user_data)
-{
-  PhotosBaseItemPrivate *priv;
-  GeglBuffer *buffer;
-  GeglNode *graph;
-  GTask *task;
-  PhotosBaseItemSaveData *data;
-
-  g_return_if_fail (PHOTOS_IS_BASE_ITEM (self));
-  priv = self->priv;
-
-  g_return_if_fail (!priv->collection);
-  g_return_if_fail (priv->edit_graph != NULL);
-  g_return_if_fail (priv->load_graph != NULL);
-  g_return_if_fail (priv->pipeline != NULL);
-  g_return_if_fail (priv->processor != NULL);
-  g_return_if_fail (!gegl_processor_work (priv->processor, NULL));
-
-  graph = photos_pipeline_get_graph (priv->pipeline);
-  buffer = photos_utils_create_buffer_from_node (graph);
-
-  data = photos_base_item_save_data_new (NULL, buffer, priv->mime_type);
-
-  task = g_task_new (self, cancellable, callback, user_data);
-  g_task_set_source_tag (task, photos_base_item_save_guess_sizes_async);
-  g_task_set_task_data (task, data, (GDestroyNotify) photos_base_item_save_data_free);
-
-  g_task_run_in_thread (task, photos_base_item_save_guess_sizes_in_thread_func);
-
-  g_object_unref (buffer);
-  g_object_unref (task);
-}
-
-
-gboolean
-photos_base_item_save_guess_sizes_finish (PhotosBaseItem *self,
-                                          GAsyncResult *res,
-                                          gsize *out_size,
-                                          gsize *out_size_1,
-                                          GError **error)
-{
-  GTask *task = G_TASK (res);
-  gboolean ret_val = FALSE;
-  gsize *sizes;
-
-  g_return_val_if_fail (PHOTOS_IS_BASE_ITEM (self), FALSE);
-  g_return_val_if_fail (g_task_is_valid (res, self), FALSE);
-  g_return_val_if_fail (g_task_get_source_tag (task) == photos_base_item_save_guess_sizes_async, FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-  sizes = g_task_propagate_pointer (task, error);
-  if (g_task_had_error (task))
-    goto out;
-
-  ret_val = TRUE;
-
-  if (out_size != NULL)
-    *out_size = sizes[0];
-  if (out_size_1 != NULL)
-    *out_size_1 = sizes[1];
-
- out:
-  return ret_val;
-}
-
-
-void
 photos_base_item_set_default_app (PhotosBaseItem *self, GAppInfo *default_app)
 {
   PhotosBaseItemPrivate *priv;
diff --git a/src/photos-base-item.h b/src/photos-base-item.h
index 701125a..9585a90 100644
--- a/src/photos-base-item.h
+++ b/src/photos-base-item.h
@@ -168,6 +168,17 @@ gchar              *photos_base_item_get_where               (PhotosBaseItem *se
 
 gint64              photos_base_item_get_width               (PhotosBaseItem *self);
 
+void                photos_base_item_guess_save_sizes_async  (PhotosBaseItem *self,
+                                                              GCancellable *cancellable,
+                                                              GAsyncReadyCallback callback,
+                                                              gpointer user_data);
+
+gboolean            photos_base_item_guess_save_sizes_finish (PhotosBaseItem *self,
+                                                              GAsyncResult *res,
+                                                              gsize *out_size,
+                                                              gsize *out_size_1,
+                                                              GError **error);
+
 gboolean            photos_base_item_is_collection           (PhotosBaseItem *self);
 
 gboolean            photos_base_item_is_favorite             (PhotosBaseItem *self);
@@ -234,17 +245,6 @@ GFile              *photos_base_item_save_finish             (PhotosBaseItem *se
                                                               GAsyncResult *res,
                                                               GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
-void                photos_base_item_save_guess_sizes_async  (PhotosBaseItem *self,
-                                                              GCancellable *cancellable,
-                                                              GAsyncReadyCallback callback,
-                                                              gpointer user_data);
-
-gboolean            photos_base_item_save_guess_sizes_finish (PhotosBaseItem *self,
-                                                              GAsyncResult *res,
-                                                              gsize *out_size,
-                                                              gsize *out_size_1,
-                                                              GError **error);
-
 void                photos_base_item_set_default_app         (PhotosBaseItem *self, GAppInfo *default_app);
 
 void                photos_base_item_set_default_app_name    (PhotosBaseItem *self, const gchar 
*default_app_name);
diff --git a/src/photos-export-dialog.c b/src/photos-export-dialog.c
index 921dbc4..bbaaf37 100644
--- a/src/photos-export-dialog.c
+++ b/src/photos-export-dialog.c
@@ -138,7 +138,7 @@ photos_export_dialog_guess_sizes (GObject *source_object, GAsyncResult *res, gpo
   gsize sizes[2];
 
   error = NULL;
-  if (!photos_base_item_save_guess_sizes_finish (item, res, &sizes[0], &sizes[1], &error))
+  if (!photos_base_item_guess_save_sizes_finish (item, res, &sizes[0], &sizes[1], &error))
     {
       success = FALSE;
 
@@ -240,7 +240,7 @@ photos_export_dialog_load (GObject *source_object, GAsyncResult *result, gpointe
             {
               self->reduced_zoom = (gdouble) PIXEL_SIZES[i] / (gdouble) max_dimension;
               photos_export_dialog_show_size_options (self, FALSE, TRUE);
-              photos_base_item_save_guess_sizes_async (self->item,
+              photos_base_item_guess_save_sizes_async (self->item,
                                                        self->cancellable,
                                                        photos_export_dialog_guess_sizes,
                                                        self);