[brasero] all: switch to g_format_size()



commit 0f13732c97e0c50d2e6a50b8c42e0e8df4b3d376
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Sep 1 14:30:30 2011 -0400

    all: switch to g_format_size()
    
    Instead of the deprecated g_format_size_for_display()
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657989

 configure.in                                |    2 +-
 libbrasero-burn/brasero-dest-selection.c    |    2 +-
 libbrasero-burn/brasero-drive-properties.c  |    2 +-
 libbrasero-burn/brasero-progress.c          |    2 +-
 libbrasero-burn/brasero-src-image.c         |    2 +-
 libbrasero-burn/brasero-status-dialog.c     |    2 +-
 libbrasero-burn/brasero-track-data-cfg.c    |    2 +-
 libbrasero-media/brasero-medium-selection.c |    2 +-
 src/brasero-project-manager.c               |    4 ++--
 src/brasero-project.c                       |    2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/configure.in b/configure.in
index 42c6df9..d857eb4 100644
--- a/configure.in
+++ b/configure.in
@@ -138,7 +138,7 @@ dnl ***************** LARGE FILE SUPPORT ***********************
 AC_SYS_LARGEFILE
 
 dnl ********** Required libraries **********************
-GLIB_REQUIRED=2.28.0
+GLIB_REQUIRED=2.29.14
 GTHREAD_REQUIRED=2.6.0
 GMODULE_REQUIRED=2.6.0
 GMODULE_EXPORT_REQUIRED=2.6.0
diff --git a/libbrasero-burn/brasero-dest-selection.c b/libbrasero-burn/brasero-dest-selection.c
index 13060a1..8d91c99 100644
--- a/libbrasero-burn/brasero-dest-selection.c
+++ b/libbrasero-burn/brasero-dest-selection.c
@@ -712,7 +712,7 @@ brasero_dest_selection_format_medium_string (BraseroMediumSelection *selection,
 							     TRUE,
 							     TRUE);
 	else
-		size_string = g_format_size_for_display (size_bytes - session_bytes);
+		size_string = g_format_size (size_bytes - session_bytes);
 
 	brasero_track_type_free (input);
 
diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index 6b079f4..cfb2db1 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -186,7 +186,7 @@ brasero_drive_properties_set_tmpdir_info (BraseroDriveProperties *self,
 	vol_size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
 	g_object_unref (info);
 
-	string_size = g_format_size_for_display (vol_size);
+	string_size = g_format_size (vol_size);
 	/* Translators: the first %s is the path of the directory where brasero
 	 * will store its temporary files; the second one is the size available */
 	string = g_strdup_printf (_("%s: %s free"), path, string_size);
diff --git a/libbrasero-burn/brasero-progress.c b/libbrasero-burn/brasero-progress.c
index d6c175d..ac5316a 100644
--- a/libbrasero-burn/brasero-progress.c
+++ b/libbrasero-burn/brasero-progress.c
@@ -244,7 +244,7 @@ brasero_burn_progress_display_session_info (BraseroBurnProgress *obj,
 		gtk_widget_show_all (table);
 	}
 
-	text = g_format_size_for_display (written);
+	text = g_format_size (written);
 	markup = g_strconcat ("<i>", text, "</i>", NULL);
 	g_free (text);
 
diff --git a/libbrasero-burn/brasero-src-image.c b/libbrasero-burn/brasero-src-image.c
index cd4ceac..e483825 100644
--- a/libbrasero-burn/brasero-src-image.c
+++ b/libbrasero-burn/brasero-src-image.c
@@ -251,7 +251,7 @@ brasero_src_image_update (BraseroSrcImage *self)
 
 	/* Deal with size */
 	brasero_track_get_size (BRASERO_TRACK (priv->track), NULL, &bytes);
-	size_string = g_format_size_for_display (bytes);
+	size_string = g_format_size (bytes);
 
 	/* NOTE to translators, the first %s is the path of the image
 	 * file and the second its size. */
diff --git a/libbrasero-burn/brasero-status-dialog.c b/libbrasero-burn/brasero-status-dialog.c
index bac595d..555d459 100644
--- a/libbrasero-burn/brasero-status-dialog.c
+++ b/libbrasero-burn/brasero-status-dialog.c
@@ -140,7 +140,7 @@ brasero_status_dialog_update (BraseroStatusDialog *self,
 	else if (brasero_track_type_get_medium_type (type) & BRASERO_MEDIUM_HAS_AUDIO)
 		size_str = brasero_units_get_time_string (session_bytes, TRUE, FALSE);
 	else
-		size_str = g_format_size_for_display (session_bytes);
+		size_str = g_format_size (session_bytes);
 
 	brasero_track_type_free (type);
 
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index be6b632..b684326 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -808,7 +808,7 @@ brasero_track_data_cfg_get_value (GtkTreeModel *model,
 		else {
 			gchar *text;
 
-			text = g_format_size_for_display (BRASERO_FILE_NODE_SECTORS (node) * 2048);
+			text = g_format_size (BRASERO_FILE_NODE_SECTORS (node) * 2048);
 			g_value_set_string (value, text);
 			g_free (text);
 		}
diff --git a/libbrasero-media/brasero-medium-selection.c b/libbrasero-media/brasero-medium-selection.c
index 69ced03..01fd50d 100644
--- a/libbrasero-media/brasero-medium-selection.c
+++ b/libbrasero-media/brasero-medium-selection.c
@@ -167,7 +167,7 @@ brasero_medium_selection_get_medium_string (BraseroMediumSelection *self,
 
 	/* format the size */
 	if (media & BRASERO_MEDIUM_HAS_DATA) {
-		size_string = g_format_size_for_display (size);
+		size_string = g_format_size (size);
 		/* NOTE for translators: the first %s is the medium name, the
 		 * second %s is the space (kio, gio) used by data on the disc.
 		 */
diff --git a/src/brasero-project-manager.c b/src/brasero-project-manager.c
index d1855cb..41bc9f4 100644
--- a/src/brasero-project-manager.c
+++ b/src/brasero-project-manager.c
@@ -250,7 +250,7 @@ brasero_project_manager_set_statusbar (BraseroProjectManager *manager,
 		||  manager->priv->type == BRASERO_PROJECT_TYPE_VIDEO)
 			size_string = brasero_units_get_time_string (files_size, TRUE, FALSE);
 		else if (manager->priv->type == BRASERO_PROJECT_TYPE_DATA)
-			size_string = g_format_size_for_display (files_size);
+			size_string = g_format_size (files_size);
 		else
 			return;
 
@@ -272,7 +272,7 @@ brasero_project_manager_set_statusbar (BraseroProjectManager *manager,
 							 size_string);
 		}
 		else if (manager->priv->type == BRASERO_PROJECT_TYPE_DATA) {
-			size_string = g_format_size_for_display (files_size);
+			size_string = g_format_size (files_size);
 			status_string = g_strdup_printf (ngettext ("%d file can be added (%s)", "%d selected files can be added (%s)", valid_num),
 							 valid_num,
 							 size_string);
diff --git a/src/brasero-project.c b/src/brasero-project.c
index 9d42c3a..0fb52b5 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -768,7 +768,7 @@ brasero_project_get_sectors_string (gint64 sectors,
 	}
 	else {
 		size_bytes = sectors * 2048LL;
-		return g_format_size_for_display (size_bytes);
+		return g_format_size (size_bytes);
 	}
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]