Attachment 188617 Details for Bug 332418

Removing total

bnc-332418.diff (text/x-patch), 3.96 KB, created by Magnus Boman on 2007-12-23 09:16:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Magnus Boman

Created: 2007-12-23 09:16:40 UTC

Size: 3.96 KB

patch

obsolete

>Index: main-menu/src/main-menu-ui.c
>===================================================================
>--- main-menu/src/main-menu-ui.c	(revision 372)
>+++ main-menu/src/main-menu-ui.c	(working copy)
>@@ -685,8 +685,6 @@
> 	tile = hard_drive_status_tile_new ();
> 
> 	gtk_icon_size_lookup (GTK_ICON_SIZE_DND, & icon_width, NULL);
>-	gtk_widget_set_size_request (tile, 6 * icon_width, -1);
>-
> 	g_signal_connect (
> 		G_OBJECT (tile), "tile-action-triggered",
> 		G_CALLBACK (tile_action_triggered_cb), this);
>@@ -698,8 +696,6 @@
> 		priv->main_menu_xml, "network-status-container"));
> 	tile = network_status_tile_new ();
> 
>-	gtk_widget_set_size_request (tile, 6 * icon_width, -1);
>-
> 	g_signal_connect (
> 		G_OBJECT (tile), "tile-action-triggered",
> 		G_CALLBACK (tile_action_triggered_cb), this);
>Index: main-menu/src/hard-drive-status-tile.c
>===================================================================
>--- main-menu/src/hard-drive-status-tile.c	(revision 372)
>+++ main-menu/src/hard-drive-status-tile.c	(working copy)
>@@ -64,9 +64,8 @@
> 	
> 	GConfClient *gconf;
> 	
>-	guint64 capacity_bytes;
>-	guint64 available_bytes;
>-	
>+	gdouble available_bytes;	
>+
> 	guint timeout_notify;
> 	
> 	guint update_timeout;
>@@ -105,9 +104,9 @@
> 	char *name;
> 
> 	image = gtk_image_new ();
>-	slab_load_image (GTK_IMAGE (image), GTK_ICON_SIZE_BUTTON, "gnome-dev-harddisk");
>+	slab_load_image (GTK_IMAGE (image), GTK_ICON_SIZE_BUTTON, "utilities-system-monitor");
> 
>-	name = g_strdup (_("Hard _Drive"));
>+	name = g_strdup (_("_System Monitor"));
> 
> 	header = gtk_label_new (name);
> 	gtk_label_set_use_underline (GTK_LABEL (header), TRUE);
>@@ -309,7 +308,6 @@
> 
> 	devices = get_pertinent_devices (priv->hal_context);
> 
>-	priv->capacity_bytes = 0;
> 	priv->available_bytes = 0;
> 
> 	for (node = devices; node; node = node->next)
>@@ -319,7 +317,6 @@
> 			glibtop_get_fsusage (&fs_usage, (gchar *) node->data);
> 
> 			priv->available_bytes += fs_usage.bfree * fs_usage.block_size;
>-			priv->capacity_bytes += fs_usage.blocks * fs_usage.block_size;
> 
> 			g_free (node->data);
> 		}
>@@ -329,26 +326,18 @@
> }
> 
> static gchar *
>-size_bytes_to_string (guint64 size)
>+size_bytes_to_string (gdouble size)
> {
> 	gchar *size_string;
>-	unsigned long long size_bytes;
> 
>-/* FIXME:  this is just a work around for gcc warnings about %lu not big enough
>- * to hold guint64 on 32bit machines.  on 64bit machines, however, gcc warns
>- * that %llu is too big for guint64.  ho-hum.
>- */
>-
>-	size_bytes = (unsigned long long) size;
>-
>-	if (size_bytes > GIGA)
>-		size_string = g_strdup_printf (_("%lluG"), size_bytes / GIGA);
>-	else if (size_bytes > MEGA)
>-		size_string = g_strdup_printf (_("%lluM"), size_bytes / MEGA);
>-	else if (size_bytes > KILO)
>-		size_string = g_strdup_printf (_("%lluK"), size_bytes / KILO);
>+	if (size > GIGA)
>+		size_string = g_strdup_printf (_("%.2fG"), size / GIGA);
>+	else if (size > MEGA)
>+		size_string = g_strdup_printf (_("%.2fM"), size / MEGA);
>+	else if (size > KILO)
>+		size_string = g_strdup_printf (_("%.2fK"), size / KILO);
> 	else
>-		size_string = g_strdup_printf (_("%llub"), size_bytes);
>+		size_string = g_strdup_printf (_("%.2fb"), size);
> 
> 	return size_string;
> }
>@@ -362,14 +351,12 @@
> 	gchar *markup = NULL;
> 
> 	gchar *available;
>-	gchar *capacity;
> 
> 	compute_usage (tile);
> 
> 	available = size_bytes_to_string (priv->available_bytes);
>-	capacity = size_bytes_to_string (priv->capacity_bytes);
> 
>-	markup = g_strdup_printf (_("%s Free / %s Total"), available, capacity);
>+	markup = g_strdup_printf (_("Home: %s Free"), available);
> 
> 	gtk_label_set_text (GTK_LABEL (NAMEPLATE_TILE (tile)->subheader), markup);
> 
>@@ -378,7 +365,6 @@
> 	  atk_object_set_description (accessible, markup);
> 
> 	g_free (available);
>-	g_free (capacity);
> 	g_free (markup);
> }
> 
>@@ -462,7 +448,7 @@
> 	fb_ditem_id = (gchar *) libslab_get_gconf_value (SYSTEM_MONITOR_GCONF_KEY);
> 
> 	if (! fb_ditem_id)
>-		fb_ditem_id = g_strdup ("nautilus.desktop");
>+		fb_ditem_id = g_strdup ("gnome-system-monitor.desktop");
> 
> 	ditem = libslab_gnome_desktop_item_new_from_unknown_id (fb_ditem_id);
>

Actions: View

Attachments on bug 332418: 183499 | 183527 | 188557 | 188560 | 188616 | 188617