[gnome-system-monitor] Fix reversed disk read/write columns (bgo#788923)

[Robert Roth <robertroth src gnome org>]

commit 172b7c7d7435ec2701a25473c7aef9dd0b34bd91
Author: Shiv Dhar <shivdhar gmail com>
Date:   Fri Dec 15 20:55:55 2017 +0530

    Fix reversed disk read/write columns (bgo#788923)

 src/application.h                                  |   12 ++++++------
 ...rg.gnome.gnome-system-monitor.gschema.xml.in.in |    8 ++++----
 src/proctable.h                                    |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/application.h b/src/application.h
index 19db300..f1f2079 100644
--- a/src/application.h
+++ b/src/application.h
@@ -82,10 +82,10 @@ MutableProcInfo()
 #endif
     start_time(0UL),
     cpu_time(0ULL),
-    disk_write_bytes_current(0ULL),
-    disk_read_bytes_current(0ULL),
-    disk_write_bytes_total(0ULL),
     disk_read_bytes_total(0ULL),
+    disk_write_bytes_total(0ULL),
+    disk_read_bytes_current(0ULL),
+    disk_write_bytes_current(0ULL),
     status(0U),
     pcpu(0U),
     nice(0)
@@ -113,10 +113,10 @@ MutableProcInfo()
 
     gulong start_time;
     guint64 cpu_time;
-    guint64 disk_write_bytes_current;
-    guint64 disk_read_bytes_current;
-    guint64 disk_write_bytes_total;
     guint64 disk_read_bytes_total;
+    guint64 disk_write_bytes_total;
+    guint64 disk_read_bytes_current;
+    guint64 disk_write_bytes_current;
     guint status;
     guint pcpu;
     gint nice;
diff --git a/src/org.gnome.gnome-system-monitor.gschema.xml.in.in 
b/src/org.gnome.gnome-system-monitor.gschema.xml.in.in
index fbf8c44..8a799ec 100644
--- a/src/org.gnome.gnome-system-monitor.gschema.xml.in.in
+++ b/src/org.gnome.gnome-system-monitor.gschema.xml.in.in
@@ -488,28 +488,28 @@
     <key name="col-22-width" type="i">
       <default>100
       </default>
-      <summary>Width of process “Total disk write” column
+      <summary>Width of process “Total disk read” column
       </summary>
     </key>
 
     <key name="col-22-visible" type="b">
       <default>true
       </default>
-      <summary>Show process “Total disk write” column on startup
+      <summary>Show process “Total disk read” column on startup
       </summary>
     </key>
 
     <key name="col-23-width" type="i">
       <default>100
       </default>
-      <summary>Width of process “Total disk read” column
+      <summary>Width of process “Total disk write” column
       </summary>
     </key>
 
     <key name="col-23-visible" type="b">
       <default>true
       </default>
-      <summary>Show process “Total disk read” column on startup
+      <summary>Show process “Total disk write” column on startup
       </summary>
     </key>
 
diff --git a/src/proctable.h b/src/proctable.h
index 6382399..a66ee93 100644
--- a/src/proctable.h
+++ b/src/proctable.h
@@ -49,10 +49,10 @@ enum
     COL_SESSION,
     COL_SEAT,
     COL_OWNER,
-    COL_DISK_WRITE_TOTAL,
     COL_DISK_READ_TOTAL,
-    COL_DISK_WRITE_CURRENT,
+    COL_DISK_WRITE_TOTAL,
     COL_DISK_READ_CURRENT,
+    COL_DISK_WRITE_CURRENT,
     COL_PRIORITY,
     COL_PIXBUF,
     COL_POINTER,