[gnome-power-manager] trivial: ensure all keys are in the GSettings schema to fix up a longstanding schema-rename bug

[Richard Hughes <rhughes src gnome org>]

commit b43a2b478c0ba2fc9f39cfab7cee823a04710a80
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jun 4 15:50:25 2010 +0100

    trivial: ensure all keys are in the GSettings schema to fix up a longstanding schema-rename bug

 data/org.gnome.power-manager.gschema.migrate |    9 ++--
 data/org.gnome.power-manager.gschema.xml     |   52 ++++++++++++++++++--------
 src/gpm-common.h                             |    9 +----
 3 files changed, 41 insertions(+), 29 deletions(-)
---
diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
index 670f789..d619fe8 100644
--- a/data/org.gnome.power-manager.gschema.migrate
+++ b/data/org.gnome.power-manager.gschema.migrate
@@ -42,11 +42,10 @@ notify-fully-charged = /apps/gnome-power-manager/notify/fully_charged
 notify-sleep-failed = /apps/gnome-power-manager/notify/sleep_failed
 notify-sleep-failed-uri = /apps/gnome-power-manager/notify/sleep_failed_uri
 notify-low-power = /apps/gnome-power-manager/notify/low_power
-statistics-show-axis-labels = /apps/gnome-power-manager/statistics/show_axis_labels
-statistics-show-events = /apps/gnome-power-manager/statistics/show_events
-statistics-smooth-data = /apps/gnome-power-manager/statistics/smooth_data
-statistics-graph-type = /apps/gnome-power-manager/statistics/graph_type
-statistics-data-max-time = /apps/gnome-power-manager/statistics/data_max_time
+info-history-graph-points = /apps/gnome-power-manager/statistics/show_events
+info-history-graph-smooth = /apps/gnome-power-manager/statistics/smooth_data
+info-history-type = /apps/gnome-power-manager/statistics/graph_type
+info-history-time = /apps/gnome-power-manager/statistics/data_max_time
 percentage-low = /apps/gnome-power-manager/thresholds/percentage_low
 percentage-critical = /apps/gnome-power-manager/thresholds/percentage_critical
 percentage-action = /apps/gnome-power-manager/thresholds/percentage_action
diff --git a/data/org.gnome.power-manager.gschema.xml b/data/org.gnome.power-manager.gschema.xml
index f71ce5d..b001e61 100644
--- a/data/org.gnome.power-manager.gschema.xml
+++ b/data/org.gnome.power-manager.gschema.xml
@@ -215,30 +215,50 @@
       <summary>Notify on a low power</summary>
       <description>If a notification message should be displayed when the battery is getting low.</description>
     </key>
-    <key name="statistics-show-axis-labels" type="b">
+    <key name="info-history-graph-points" type="b">
       <default>true</default>
-      <summary>Whether we should show the axis labels in the statistics window</summary>
-      <description>Whether we should show the axis labels in the statistics window.</description>
+      <summary>Whether we should show the history data points</summary>
+      <description>Whether we should show the history data points in the statistics window.</description>
     </key>
-    <key name="statistics-show-events" type="b">
+    <key name="info-history-graph-smooth" type="b">
       <default>true</default>
-      <summary>Whether we should show the events in the statistics window</summary>
-      <description>Whether we should show the events in the statistics window.</description>
+      <summary>Whether we should smooth the history data</summary>
+      <description>Whether we should smooth the history data in the graph.</description>
     </key>
-    <key name="statistics-smooth-data" type="b">
+    <key name="info-history-type" type="s">
+      <default>'power'</default>
+      <summary>The default graph type to show for history</summary>
+      <description>The default graph type to show in the history window.</description>
+    </key>
+    <key name="info-history-time" type="i">
+      <default>21600</default>
+      <summary>The maximum time displayed for history</summary>
+      <description>The maximum duration of time displayed on the x-axis of the history graph.</description>
+    </key>
+    <key name="info-stats-graph-points" type="b">
+      <default>true</default>
+      <summary>Whether we should show the stats data points</summary>
+      <description>Whether we should show the stats data points in the statistics window.</description>
+    </key>
+    <key name="info-stats-graph-smooth" type="b">
       <default>true</default>
-      <summary>Whether we should smooth the data in the graph</summary>
-      <description>Whether we should smooth the data in the graph.</description>
+      <summary>Whether we should smooth the stats data</summary>
+      <description>Whether we should smooth the stats data in the graph.</description>
     </key>
-    <key name="statistics-graph-type" type="s">
+    <key name="info-stats-type" type="s">
       <default>'power'</default>
-      <summary>The default graph type to show in the statistics window</summary>
-      <description>The default graph type to show in the statistics window.</description>
+      <summary>The default graph type to show for stats</summary>
+      <description>The default graph type to show in the stats window.</description>
     </key>
-    <key name="statistics-data-max-time" type="i">
-      <default>21600</default>
-      <summary>The maximum time displayed on the graph</summary>
-      <description>The maximum duration of time displayed on the x-axis of the graph.</description>
+    <key name="info-page-number" type="i">
+      <default>0</default>
+      <summary>The index of the page number to show by default</summary>
+      <description>The index of the page number to show by default which is used to return focus to the correct page.</description>
+    </key>
+    <key name="info-last-device" type="s">
+      <default>''</default>
+      <summary>The ID of the last device selected</summary>
+      <description>The identifier of the last device which is used to return focus to the correct device.</description>
     </key>
     <key name="percentage-low" type="i">
       <default>10</default>
diff --git a/src/gpm-common.h b/src/gpm-common.h
index ec09cac..b57ae70 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -102,13 +102,6 @@ G_BEGIN_DECLS
 #define GPM_SETTINGS_NOTIFY_SLEEP_FAILED_URI		"notify-sleep-failed-uri"
 #define GPM_SETTINGS_NOTIFY_LOW_POWER			"notify-low-power"
 
-/* statistics */
-#define GPM_SETTINGS_STATS_SHOW_AXIS_LABELS		"statistics-show-axis-labels"
-#define GPM_SETTINGS_STATS_SHOW_EVENTS			"statistics-show-events"
-#define GPM_SETTINGS_STATS_SMOOTH_DATA			"statistics-smooth-data"
-#define GPM_SETTINGS_STATS_GRAPH_TYPE			"statistics-graph-type"
-#define GPM_SETTINGS_STATS_MAX_TIME			"statistics-data-max-time"
-
 /* thresholds */
 #define GPM_SETTINGS_PERCENTAGE_LOW			"percentage-low"
 #define GPM_SETTINGS_PERCENTAGE_CRITICAL		"percentage-critical"
@@ -130,7 +123,7 @@ G_BEGIN_DECLS
 #define GPM_SETTINGS_ENABLE_SOUND			"enable-sound"
 #define GPM_SETTINGS_SHOW_ACTIONS			"show-actions"
 
-/* new info binary */
+/* statistics */
 #define GPM_SETTINGS_INFO_HISTORY_TIME			"info-history-time"
 #define GPM_SETTINGS_INFO_HISTORY_TYPE			"info-history-type"
 #define GPM_SETTINGS_INFO_HISTORY_GRAPH_SMOOTH		"info-history-graph-smooth"