? depcomp
? stamp-h1
? po/stamp-it
Index: src/disks.c
===================================================================
RCS file: /cvs/gnome/procman/src/disks.c,v
retrieving revision 1.3
diff -p -u -u -p -r1.3 disks.c
--- src/disks.c	29 Dec 2005 08:25:27 -0000	1.3
+++ src/disks.c	4 Jan 2006 14:29:01 -0000
@@ -121,10 +121,10 @@ add_disk(GtkListStore *list, const glibt
 	glibtop_get_fsusage(&usage, entry->mountdir);
 	fsusage_stats(&usage, &bused, &bfree, &bavail, &btotal, &percentage);
 
-	used_str = SI_gnome_vfs_format_file_size_for_display(bused);
-	free_str = SI_gnome_vfs_format_file_size_for_display(bfree);
-	avail_str = SI_gnome_vfs_format_file_size_for_display(bavail);
-	total_str = SI_gnome_vfs_format_file_size_for_display(btotal);
+	used_str = gnome_vfs_format_file_size_for_display(bused);
+	free_str = gnome_vfs_format_file_size_for_display(bfree);
+	avail_str = gnome_vfs_format_file_size_for_display(bavail);
+	total_str = gnome_vfs_format_file_size_for_display(btotal);
 
 	gtk_list_store_append(list, &iter);
 	gtk_list_store_set(list, &iter,
Index: src/load-graph.c
===================================================================
RCS file: /cvs/gnome/procman/src/load-graph.c,v
retrieving revision 1.50
diff -p -u -u -p -r1.50 load-graph.c
--- src/load-graph.c	2 Jan 2006 09:28:58 -0000	1.50
+++ src/load-graph.c	4 Jan 2006 14:29:01 -0000
@@ -264,8 +264,8 @@ get_memory (LoadGraph *g)
 	swappercent = (swap.total ? (float)swap.used / (float)swap.total : 0.0f);
 	mempercent  = (float)mem.user  / (float)mem.total;
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (mem.total);
-	text2 = SI_gnome_vfs_format_file_size_for_display (mem.user);
+	text1 = gnome_vfs_format_file_size_for_display (mem.total);
+	text2 = gnome_vfs_format_file_size_for_display (mem.user);
 	text3 = g_strdup_printf ("  %.1f %%", mempercent * 100.0f);
 	gtk_label_set_text (GTK_LABEL (g->labels.memused), text2);
 	gtk_label_set_text (GTK_LABEL (g->labels.memtotal), text1);
@@ -274,8 +274,8 @@ get_memory (LoadGraph *g)
 	g_free (text2);
 	g_free (text3);
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (swap.total);
-	text2 = SI_gnome_vfs_format_file_size_for_display (swap.used);
+	text1 = gnome_vfs_format_file_size_for_display (swap.total);
+	text2 = gnome_vfs_format_file_size_for_display (swap.used);
 	text3 = g_strdup_printf ("  %.1f %%", swappercent * 100.0f);
 	gtk_label_set_text (GTK_LABEL (g->labels.swapused), text2);
 	gtk_label_set_text (GTK_LABEL (g->labels.swaptotal), text1);
@@ -364,23 +364,23 @@ get_net (LoadGraph *g)
 
 	net_scale (g, MAX (din, dout));
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (din);
+	text1 = gnome_vfs_format_file_size_for_display (din);
 	text2 = g_strdup_printf (_("%s/s"), text1);
 	gtk_label_set_text (GTK_LABEL (g->labels.net_in), text2);
 	g_free (text1);
 	g_free (text2);
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (in);
+	text1 = gnome_vfs_format_file_size_for_display (in);
 	gtk_label_set_text (GTK_LABEL (g->labels.net_in_total), text1);
 	g_free (text1);
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (dout);
+	text1 = gnome_vfs_format_file_size_for_display (dout);
 	text2 = g_strdup_printf (_("%s/s"), text1);
 	gtk_label_set_text (GTK_LABEL (g->labels.net_out), text2);
 	g_free (text1);
 	g_free (text2);
 
-	text1 = SI_gnome_vfs_format_file_size_for_display (out);
+	text1 = gnome_vfs_format_file_size_for_display (out);
 	gtk_label_set_text (GTK_LABEL (g->labels.net_out_total), text1);
 	g_free (text1);
 }
Index: src/memmaps.c
===================================================================
RCS file: /cvs/gnome/procman/src/memmaps.c,v
retrieving revision 1.50
diff -p -u -u -p -r1.50 memmaps.c
--- src/memmaps.c	29 Oct 2005 19:24:59 -0000	1.50
+++ src/memmaps.c	4 Jan 2006 14:29:01 -0000
@@ -121,7 +121,7 @@ add_new_maps (gpointer key, gpointer val
 
 	vmstart  = vmoff_tostring (memmaps->start);
 	vmend    = vmoff_tostring (memmaps->end);
-	vmsize   = SI_gnome_vfs_format_file_size_for_display (size);
+	vmsize   = gnome_vfs_format_file_size_for_display (size);
 	vmoffset = vmoff_tostring (memmaps->offset);
 	device   = g_strdup_printf ("%02hx:%02hx", dev_major, dev_minor);
 	inode    = g_strdup_printf ("%llu", memmaps->inode);
Index: src/proctable.c
===================================================================
RCS file: /cvs/gnome/procman/src/proctable.c,v
retrieving revision 1.164
diff -p -u -u -p -r1.164 proctable.c
--- src/proctable.c	2 Jan 2006 09:06:22 -0000	1.164
+++ src/proctable.c	4 Jan 2006 14:29:02 -0000
@@ -596,11 +596,11 @@ update_info_mutable_cols(GtkTreeStore *s
 	gchar *vmsize, *memres, *memwritable, *memshared, *memxserver,
 		*cpu_time, *start_time;
 
-	vmsize	   = SI_gnome_vfs_format_file_size_for_display (info->vmsize);
-	memres	   = SI_gnome_vfs_format_file_size_for_display (info->memres);
-	memwritable = SI_gnome_vfs_format_file_size_for_display (info->memwritable);
-	memshared  = SI_gnome_vfs_format_file_size_for_display (info->memshared);
-	memxserver = SI_gnome_vfs_format_file_size_for_display (info->memxserver);
+	vmsize	   = gnome_vfs_format_file_size_for_display (info->vmsize);
+	memres	   = gnome_vfs_format_file_size_for_display (info->memres);
+	memwritable = gnome_vfs_format_file_size_for_display (info->memwritable);
+	memshared  = gnome_vfs_format_file_size_for_display (info->memshared);
+	memxserver = gnome_vfs_format_file_size_for_display (info->memxserver);
 
 	cpu_time = format_duration_for_display (info->cpu_time_last / procdata->frequency);
 
Index: src/util.c
===================================================================
RCS file: /cvs/gnome/procman/src/util.c,v
retrieving revision 1.25
diff -p -u -u -p -r1.25 util.c
--- src/util.c	2 May 2005 13:10:39 -0000	1.25
+++ src/util.c	4 Jan 2006 14:29:02 -0000
@@ -61,45 +61,3 @@ procman_make_label_for_mmaps_or_ofiles(c
 
 	return label;
 }
-
-
-
-#define KIBIBYTE_FACTOR 1024.0
-#define MEBIBYTE_FACTOR (1024.0 * 1024.0)
-#define GIBIBYTE_FACTOR (1024.0 * 1024.0 * 1024.0)
-
-
-/**
- * SI_gnome_vfs_format_file_size_for_display:
- * @size:
- * 
- * Formats the file size passed in @bytes in a way that is easy for
- * the user to read. Gives the size in bytes, kibibytes, mebibytes or
- * gibibytes, choosing whatever is appropriate.
- * 
- * Returns: a newly allocated string with the size ready to be shown.
- **/
-
-gchar*
-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size)
-{
-	if (size < (GnomeVFSFileSize) KIBIBYTE_FACTOR) {
-		return g_strdup_printf (dngettext(GETTEXT_PACKAGE, "%u byte", "%u bytes",(guint) size), (guint) size);
-	} else {
-		gdouble displayed_size;
-
-		if (size < (GnomeVFSFileSize) MEBIBYTE_FACTOR) {
-			displayed_size = (gdouble) size / KIBIBYTE_FACTOR;
-			return g_strdup_printf (_("%.1f KiB"),
-						       displayed_size);
-		} else if (size < (GnomeVFSFileSize) GIBIBYTE_FACTOR) {
-			displayed_size = (gdouble) size / MEBIBYTE_FACTOR;
-			return g_strdup_printf (_("%.1f MiB"),
-						       displayed_size);
-		} else {
-			displayed_size = (gdouble) size / GIBIBYTE_FACTOR;
-			return g_strdup_printf (_("%.1f GiB"),
-						       displayed_size);
-		}
-	}
-}
