Update upstream source from tag 'upstream/2.0.7pre'

Update to upstream version '2.0.7pre'
with Debian dir a2ec7db1aec5f19fb8cfbe1c84a27b4779b604d0

2 files changed, 9 insertions, 2 deletions

diff --git a/shell/loadgraph-uber.c b/shell/loadgraph-uber.c
index 08f1e2b5..eeee6051 100644
--- a/shell/loadgraph-uber.c
+++ b/shell/loadgraph-uber.c
@@ -81,11 +81,12 @@ void load_graph_set_title(LoadGraph * lg, const gchar *title)
 
 void load_graph_clear(LoadGraph * lg)
 {
-    int i;
+  int i;
     if (lg != NULL) {
         for (i = 0; i < LG_MAX_LINES; i++) {
             lg->cur_value[i] = UBER_LINE_GRAPH_NO_VALUE;
         }
+        uber_line_graph_clear(UBER_LINE_GRAPH(lg->uber_widget));
         uber_graph_scale_changed(UBER_GRAPH(lg->uber_widget));
     }
 }
diff --git a/shell/shell.c b/shell/shell.c
index a2773523..22b1003f 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -861,6 +861,7 @@ static gboolean update_field(gpointer data)
     /* if the entry is still selected, update it */
     if (fu->entry->selected && fu->entry->fieldfunc) {
         gchar *value = fu->entry->fieldfunc(fu->field_name);
+	gdouble v;
 
         if (item->is_iter) {
             /*
@@ -872,7 +873,12 @@ static gboolean update_field(gpointer data)
                                                     item->iter)) {
 
                 load_graph_set_title(shell->loadgraph, fu->field_name);
-                load_graph_update(shell->loadgraph, atof(value));
+                v=atof(value);
+		//fix KiB->Bytes for UberGraph (GTK3)
+#if GTK_CHECK_VERSION(3, 0, 0)
+                if(strstr(value,"KiB")) v*=1024;
+#endif
+                load_graph_update(shell->loadgraph, v);
             }
 
             GtkTreeStore *store = GTK_TREE_STORE(shell->info_tree->model);