From 0f608da66ca5041a54e30676bc15e6babb716184 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 20 Apr 2009 11:46:37 -0400
Subject: [PATCH] Use MB instead of GB for pretty memory < 10GB. (Gerrit
 Slomma)

---
 AUTHORS                       |  2 ++
 src/virtManager/connection.py |  8 ++++----
 src/virtManager/domain.py     | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 99babf0a8..5d0c2a579 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ The user interaction / interface design and artwork is
 done by:
 
    Máirín Duffy <duffy-at-redhat-dot-com>
+   Jeremy Perry <jeperry-at-redhat-dot-com>
 
 Further patches have been submitted by:
 
@@ -52,6 +53,7 @@ Further patches have been submitted by:
   Radek Hladik <radek-at-eadresa-dot-cz>
   Michael Marineau (marineam-at-gentoo-dot-org)
   Vitaly Mayatskikh <vmayatsk-at-redhat-dot-com>
+  Gerrit Slomma <roadrunner_gs-at-web-dot-de>
 
   <...send a patch & get your name here...>
 
diff --git a/src/virtManager/connection.py b/src/virtManager/connection.py
index edf5e8d5e..af3351bc1 100644
--- a/src/virtManager/connection.py
+++ b/src/virtManager/connection.py
@@ -711,10 +711,10 @@ class vmmConnection(gobject.GObject):
         if self.vmm is None:
             return ""
         mem = self.host_memory_size()
-        if mem > (1024*1024):
+        if mem > (10*1024*1024):
             return "%2.2f GB" % (mem/(1024.0*1024.0))
         else:
-            return "%2.2f MB" % (mem/1024.0)
+            return "%2.0f MB" % (mem/1024.0)
 
 
     def host_memory_size(self):
@@ -1135,10 +1135,10 @@ class vmmConnection(gobject.GObject):
 
     def pretty_current_memory(self):
         mem = self.current_memory()
-        if mem > (1024*1024):
+        if mem > (10*1024*1024):
             return "%2.2f GB" % (mem/(1024.0*1024.0))
         else:
-            return "%2.2f MB" % (mem/1024.0)
+            return "%2.0f MB" % (mem/1024.0)
 
     def current_memory_percentage(self):
         if len(self.record) == 0:
diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py
index bc6878d14..339b521e2 100644
--- a/src/virtManager/domain.py
+++ b/src/virtManager/domain.py
@@ -370,7 +370,7 @@ class vmmDomain(gobject.GObject):
 
     def current_memory_pretty(self):
         if self.get_id() == -1:
-            return "0.00 MB"
+            return "0 MB"
         return self.get_memory_pretty()
 
 
@@ -391,10 +391,10 @@ class vmmDomain(gobject.GObject):
 
     def get_memory_pretty(self):
         mem = self.get_memory()
-        if mem > (1024*1024):
+        if mem > (10*1024*1024):
             return "%2.2f GB" % (mem/(1024.0*1024.0))
         else:
-            return "%2.2f MB" % (mem/1024.0)
+            return "%2.0f MB" % (mem/1024.0)
 
 
     def maximum_memory(self):
@@ -409,10 +409,10 @@ class vmmDomain(gobject.GObject):
 
     def maximum_memory_pretty(self):
         mem = self.maximum_memory()
-        if mem > (1024*1024):
+        if mem > (10*1024*1024):
             return "%2.2f GB" % (mem/(1024.0*1024.0))
         else:
-            return "%2.2f MB" % (mem/1024.0)
+            return "%2.0f MB" % (mem/1024.0)
 
 
     def cpu_time(self):