From 405bec23c0a1cf97e39171fabc6596c9ab7f7a5e Mon Sep 17 00:00:00 2001
From: Monsta <monsta@inbox.ru>
Date: Tue, 28 Apr 2015 14:10:17 +0300
Subject: dropped udisks support for several reasons.

1. udisks1 will soon be dropped from debian and ubuntu, and probably from
other major distros as well. it's replaced by udisks2.

2. the only udisks1 feature that was used in m-p-m was the disk spindown.
its usefullness is questionable, especially when you have an SSD.

3. udisks2 doesn't seem to have neither API nor command-line tools for the
spindown feature.

4. spindown support has been dropped in gnome-power-manager in 2011,
https://git.gnome.org/browse/gnome-power-manager/commit/?id=d97a988246d34f4cd38b7ee1335c9b500c7c522f

5. it also has been dropped in xfce-power-manager in 2014,
http://git.xfce.org/xfce/xfce4-power-manager/log/?qt=grep&q=disk+spin+down

Closes https://github.com/mate-desktop/mate-power-manager/pull/144
---
 data/gpm-prefs.ui                          | 30 ------------------------------
 data/mate-power-manager.convert            |  4 ----
 data/org.mate.power-manager.gschema.xml.in | 20 --------------------
 3 files changed, 54 deletions(-)

(limited to 'data')

diff --git a/data/gpm-prefs.ui b/data/gpm-prefs.ui
index 27e4891..24141ba 100644
--- a/data/gpm-prefs.ui
+++ b/data/gpm-prefs.ui
@@ -161,21 +161,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_ac_spindown">
-                                <property name="label" translatable="yes">Sp_in down hard disks when possible</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                         </child>
                       </object>
@@ -446,21 +431,6 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_battery_spindown">
-                                <property name="label" translatable="yes">Sp_in down hard disks when possible</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/data/mate-power-manager.convert b/data/mate-power-manager.convert
index 32f3549..40a6a84 100644
--- a/data/mate-power-manager.convert
+++ b/data/mate-power-manager.convert
@@ -47,10 +47,6 @@ sleep-computer-ups = /apps/mate-power-manager/timeout/sleep_computer_ups
 sleep-display-ac = /apps/mate-power-manager/timeout/sleep_display_ac
 sleep-display-battery = /apps/mate-power-manager/timeout/sleep_display_battery
 sleep-display-ups = /apps/mate-power-manager/timeout/sleep_display_ups
-spindown-enable-ac = /apps/mate-power-manager/disks/spindown_enable_ac
-spindown-enable-battery = /apps/mate-power-manager/disks/spindown_enable_battery
-spindown-timeout-ac = /apps/mate-power-manager/disks/spindown_timeout_ac
-spindown-timeout-battery = /apps/mate-power-manager/disks/spindown_timeout_battery
 time-action = /apps/mate-power-manager/thresholds/time_action
 time-critical = /apps/mate-power-manager/thresholds/time_critical
 time-low = /apps/mate-power-manager/thresholds/time_low
diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
index ca009b5..ba0cab1 100644
--- a/data/org.mate.power-manager.gschema.xml.in
+++ b/data/org.mate.power-manager.gschema.xml.in
@@ -191,26 +191,6 @@
       <_summary>Lock GNOME keyring on sleep</_summary>
       <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
     </key>
-    <key name="spindown-enable-ac" type="b">
-      <default>false</default>
-      <_summary>If the low-power mode should be enabled when on AC</_summary>
-      <_description>If the system low-power mode should be enabled when on AC power.</_description>
-    </key>
-    <key name="spindown-enable-battery" type="b">
-      <default>true</default>
-      <_summary>If the low-power mode should be enabled when on battery</_summary>
-      <_description>If the system low-power mode should be enabled when on laptop battery power.</_description>
-    </key>
-    <key name="spindown-timeout-ac" type="i">
-      <default>600</default>
-      <_summary>Seconds of inactivity to spin down when on AC</_summary>
-      <_description>The number of seconds of inactivity to spin down the disks when on AC power.</_description>
-    </key>
-    <key name="spindown-timeout-battery" type="i">
-      <default>60</default>
-      <_summary>Seconds of inactivity to spin down when on battery</_summary>
-      <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description>
-    </key>
     <key name="notify-low-capacity" type="b">
       <default>true</default>
       <_summary>If we should show the low capacity warning for a broken battery</_summary>
-- 
cgit v1.2.1