GNOME.org
 

[gthumb] Replace deprecated g_format_size_for_display

commit 4baf526fedf14ce6cab8f2353c1100ea8a8c2698
Author: Greg Mansfield <G Mansfield computer org>
Date:   Wed Jan 25 20:42:59 2012 +0100

    Replace deprecated g_format_size_for_display

 extensions/facebook/dlg-export-to-facebook.c       |    2 +-
 extensions/find_duplicates/gth-find-duplicates.c   |    4 ++--
 extensions/flicker_utils/dlg-export-to-flickr.c    |    4 ++--
 extensions/importer/gth-import-task.c              |    4 ++--
 extensions/photo_importer/dlg-photo-importer.c     |    2 +-
 extensions/photobucket/dlg-export-to-photobucket.c |    4 ++--
 extensions/picasaweb/dlg-export-to-picasaweb.c     |    6 +++---
 extensions/picasaweb/dlg-import-from-picasaweb.c   |    4 ++--
 extensions/webalbums/gth-web-exporter.c            |    2 +-
 gthumb/gio-utils.c                                 |    4 ++--
 gthumb/gth-browser.c                               |    6 +++---
 gthumb/gth-metadata-provider-file.c                |    2 +-
 gthumb/gth-overwrite-dialog.c                      |    4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/extensions/facebook/dlg-export-to-facebook.c b/extensions/facebook/dlg-export-to-facebook.c
index 4dac146..bbc6e51 100644
--- a/extensions/facebook/dlg-export-to-facebook.c
+++ b/extensions/facebook/dlg-export-to-facebook.c
@@ -566,7 +566,7 @@ dlg_export_to_facebook (GthBrowser *browser,
 		return;
 	}
 
-	total_size_formatted = g_format_size_for_display (total_size);
+	total_size_formatted = g_format_size (total_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text);
 	g_free (text);
diff --git a/extensions/find_duplicates/gth-find-duplicates.c b/extensions/find_duplicates/gth-find-duplicates.c
index 7685865..ec593f0 100644
--- a/extensions/find_duplicates/gth-find-duplicates.c
+++ b/extensions/find_duplicates/gth-find-duplicates.c
@@ -251,7 +251,7 @@ update_file_list_selection_info (GthFindDuplicates *self)
 		while (gtk_tree_model_iter_next (model, &iter));
 	}
 
-	size_formatted = g_format_size_for_display (total_size);
+	size_formatted = g_format_size (total_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_files), n_files, size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("total_files_label")), text);
 
@@ -343,7 +343,7 @@ update_total_duplicates_label (GthFindDuplicates *self)
 	char *size_formatted;
 	char *text;
 
-	size_formatted = g_format_size_for_display (self->priv->duplicates_size);
+	size_formatted = g_format_size (self->priv->duplicates_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", self->priv->n_duplicates), self->priv->n_duplicates, size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("total_duplicates_label")), text);
 
diff --git a/extensions/flicker_utils/dlg-export-to-flickr.c b/extensions/flicker_utils/dlg-export-to-flickr.c
index b30098b..f2afc44 100644
--- a/extensions/flicker_utils/dlg-export-to-flickr.c
+++ b/extensions/flicker_utils/dlg-export-to-flickr.c
@@ -368,7 +368,7 @@ update_account_list (DialogData *data)
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx);
 
-	free_space = g_format_size_for_display (data->user->max_bandwidth - data->user->used_bandwidth);
+	free_space = g_format_size (data->user->max_bandwidth - data->user->used_bandwidth);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space);
 	g_free (free_space);
 }
@@ -562,7 +562,7 @@ dlg_export_to_flickr (FlickrServer *server,
 		return;
 	}
 
-	total_size_formatted = g_format_size_for_display (total_size);
+	total_size_formatted = g_format_size (total_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text);
 	g_free (text);
diff --git a/extensions/importer/gth-import-task.c b/extensions/importer/gth-import-task.c
index a1a6e26..ba3e496 100644
--- a/extensions/importer/gth-import-task.c
+++ b/extensions/importer/gth-import-task.c
@@ -843,8 +843,8 @@ gth_import_task_check_free_space (GFile   *destination,
 		char *free_space_s;
 
 		destination_name = g_file_get_parse_name (destination);
-		min_free_space_s = g_format_size_for_display (min_free_space);
-		free_space_s = g_format_size_for_display (free_space);
+		min_free_space_s = g_format_size (min_free_space);
+		free_space_s = g_format_size (free_space);
 
 		*error = g_error_new (G_IO_ERROR,
 				      G_IO_ERROR_NO_SPACE,
diff --git a/extensions/photo_importer/dlg-photo-importer.c b/extensions/photo_importer/dlg-photo-importer.c
index 4e70e02..2d1b6e0 100644
--- a/extensions/photo_importer/dlg-photo-importer.c
+++ b/extensions/photo_importer/dlg-photo-importer.c
@@ -294,7 +294,7 @@ update_status (DialogData *data)
 		size += g_file_info_get_size (file_data->info);
 		n_selected += 1;
 	}
-	ssize = g_format_size_for_display (size);
+	ssize = g_format_size (size);
 	/* translators: %d is the number of files, %s the total size */
 	status = g_strdup_printf (_("Files to import: %d (%s)"), n_selected, ssize);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("status_label")), status);
diff --git a/extensions/photobucket/dlg-export-to-photobucket.c b/extensions/photobucket/dlg-export-to-photobucket.c
index f69d632..33429af 100644
--- a/extensions/photobucket/dlg-export-to-photobucket.c
+++ b/extensions/photobucket/dlg-export-to-photobucket.c
@@ -280,7 +280,7 @@ update_account_list (DialogData *data)
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx);
 
-	free_space = g_format_size_for_display ((data->account->megabytes_allowed - data->account->megabytes_used) * (1024 * 1024));
+	free_space = g_format_size ((data->account->megabytes_allowed - data->account->megabytes_used) * (1024 * 1024));
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space);
 	g_free (free_space);
 
@@ -619,7 +619,7 @@ dlg_export_to_photobucket (GthBrowser *browser,
 		return;
 	}
 
-	total_size_formatted = g_format_size_for_display (total_size);
+	total_size_formatted = g_format_size (total_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text);
 	g_free (text);
diff --git a/extensions/picasaweb/dlg-export-to-picasaweb.c b/extensions/picasaweb/dlg-export-to-picasaweb.c
index 4030b94..823f056 100644
--- a/extensions/picasaweb/dlg-export-to-picasaweb.c
+++ b/extensions/picasaweb/dlg-export-to-picasaweb.c
@@ -289,7 +289,7 @@ update_album_list (DialogData *data)
 
 	g_return_if_fail (data->user != NULL);
 
-	free_space = g_format_size_for_display (data->user->quota_limit - data->user->quota_current);
+	free_space = g_format_size (data->user->quota_limit - data->user->quota_current);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space);
 	g_free (free_space);
 
@@ -300,7 +300,7 @@ update_album_list (DialogData *data)
 		char           *used_bytes;
 
 		n_photos_remaining = g_strdup_printf ("%d", album->n_photos_remaining);
-		used_bytes = g_format_size_for_display (album->used_bytes);
+		used_bytes = g_format_size (album->used_bytes);
 
 		gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter,
@@ -1006,7 +1006,7 @@ dlg_export_to_picasaweb (GthBrowser *browser,
 		return;
 	}
 
-	total_size_formatted = g_format_size_for_display (total_size);
+	total_size_formatted = g_format_size (total_size);
 	text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text);
 	g_free (text);
diff --git a/extensions/picasaweb/dlg-import-from-picasaweb.c b/extensions/picasaweb/dlg-import-from-picasaweb.c
index be1e4bc..a4d7d87 100644
--- a/extensions/picasaweb/dlg-import-from-picasaweb.c
+++ b/extensions/picasaweb/dlg-import-from-picasaweb.c
@@ -262,7 +262,7 @@ update_album_list (DialogData *data)
 		PicasaWebAlbum *album = scan->data;
 		char           *used_bytes;
 
-		used_bytes = g_format_size_for_display (album->used_bytes);
+		used_bytes = g_format_size (album->used_bytes);
 
 		gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter);
 		gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter,
@@ -799,7 +799,7 @@ update_selection_status (DialogData *data)
 		size_selected += g_file_info_get_size (file_data->info);
 	}
 
-	size_selected_formatted = g_format_size_for_display (size_selected);
+	size_selected_formatted = g_format_size (size_selected);
 	text_selected = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_selected), n_selected, size_selected_formatted);
 	gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text_selected);
 
diff --git a/extensions/webalbums/gth-web-exporter.c b/extensions/webalbums/gth-web-exporter.c
index 7bedc20..9f4f7cd 100644
--- a/extensions/webalbums/gth-web-exporter.c
+++ b/extensions/webalbums/gth-web-exporter.c
@@ -1381,7 +1381,7 @@ gth_parsed_doc_print (GthWebExporter      *self,
 		case GTH_TAG_FILE_SIZE:
 			idx = get_image_idx (tag, self);
 			idata = g_list_nth (self->priv->file_list, idx)->data;
-			line = g_format_size_for_display (g_file_info_get_size (idata->file_data->info));
+			line = g_format_size (g_file_info_get_size (idata->file_data->info));
 			write_markup_escape_line (ostream, line, error);
 			break;
 
diff --git a/gthumb/gio-utils.c b/gthumb/gio-utils.c
index 8cfacd7..2a9eaa4 100644
--- a/gthumb/gio-utils.c
+++ b/gthumb/gio-utils.c
@@ -1349,8 +1349,8 @@ copy_file_progress_cb (goffset  current_num_bytes,
 	if (copy_file_data->progress_callback == NULL)
 		return;
 
-	s1 = g_format_size_for_display (copy_file_data->copied_size + current_num_bytes);
-	s2 = g_format_size_for_display (copy_file_data->tot_size);
+	s1 = g_format_size (copy_file_data->copied_size + current_num_bytes);
+	s2 = g_format_size (copy_file_data->tot_size);
 	/* For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB */
 	details = g_strdup_printf (_("%s of %s"), s1, s2);
 
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index fb95e0a..fff9633 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -990,8 +990,8 @@ _update_statusbar_list_info (GthBrowser *browser)
 
 	/**/
 
-	size_total_formatted = g_format_size_for_display (size_total);
-	size_selected_formatted = g_format_size_for_display (size_selected);
+	size_total_formatted = g_format_size (size_total);
+	size_selected_formatted = g_format_size (size_selected);
 	text_total = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, size_total_formatted);
 	text_selected = g_strdup_printf (g_dngettext (NULL, "%d file selected (%s)", "%d files selected (%s)", n_selected), n_selected, size_selected_formatted);
 
@@ -1027,7 +1027,7 @@ get_free_space_ready_cb (GthFileSource *file_source,
 	if (error == NULL) {
 		char *free_space_formatted;
 
-		free_space_formatted = g_format_size_for_display (free_space);
+		free_space_formatted = g_format_size (free_space);
 		free_space_text = g_strdup_printf (_("%s of free space"), free_space_formatted);
 
 		g_free (free_space_formatted);
diff --git a/gthumb/gth-metadata-provider-file.c b/gthumb/gth-metadata-provider-file.c
index 96fbd1d..31f93ca 100644
--- a/gthumb/gth-metadata-provider-file.c
+++ b/gthumb/gth-metadata-provider-file.c
@@ -55,7 +55,7 @@ gth_metadata_provider_file_read (GthMetadataProvider *self,
 
 	matcher = g_file_attribute_matcher_new (attributes);
 
-	value = g_format_size_for_display (g_file_info_get_size (file_data->info));
+	value = g_format_size (g_file_info_get_size (file_data->info));
 	g_file_info_set_attribute_string (file_data->info, "gth::file::display-size", value);
 	g_free (value);
 
diff --git a/gthumb/gth-overwrite-dialog.c b/gthumb/gth-overwrite-dialog.c
index da4bc5a..9299c9e 100644
--- a/gthumb/gth-overwrite-dialog.c
+++ b/gthumb/gth-overwrite-dialog.c
@@ -144,7 +144,7 @@ info_ready_cb (GList    *files,
 
 		gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "new_image_filename_label")), g_file_info_get_display_name (self->priv->source_data->info));
 
-		text = g_format_size_for_display (g_file_info_get_size (self->priv->source_data->info));
+		text = g_format_size (g_file_info_get_size (self->priv->source_data->info));
 		gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "new_image_size_label")), text);
 		g_free (text);
 
@@ -190,7 +190,7 @@ info_ready_cb (GList    *files,
 
 	gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "old_image_filename_label")), g_file_info_get_display_name (self->priv->destination_data->info));
 
-	text = g_format_size_for_display (g_file_info_get_size (self->priv->destination_data->info));
+	text = g_format_size (g_file_info_get_size (self->priv->destination_data->info));
 	gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "old_image_size_label")), text);
 	g_free (text);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]