[gnome-settings-daemon] power: Remove manager_critical{_ups, }_action_do_cb()



commit f6f48bb568b3e416a1f517b0c1f2ba6192c3161b
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Oct 17 09:28:09 2013 +0200

    power: Remove manager_critical{_ups,}_action_do_cb()
    
    They didn't do anything different from the existing functions.

 plugins/power/gsd-power-manager.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 813c828..72fbeea 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -539,8 +539,7 @@ manager_critical_action_get (GsdPowerManager *manager)
 }
 
 static gboolean
-manager_critical_action_do (GsdPowerManager *manager,
-                            gboolean         is_ups)
+manager_critical_action_do_cb (GsdPowerManager *manager)
 {
         /* stop playing the alert as it's too late to do anything now */
         play_loop_stop (&manager->priv->critical_alert_timeout_id);
@@ -549,20 +548,6 @@ manager_critical_action_do (GsdPowerManager *manager,
 }
 
 static gboolean
-manager_critical_action_do_cb (GsdPowerManager *manager)
-{
-        manager_critical_action_do (manager, FALSE);
-        return FALSE;
-}
-
-static gboolean
-manager_critical_ups_action_do_cb (GsdPowerManager *manager)
-{
-        manager_critical_action_do (manager, TRUE);
-        return FALSE;
-}
-
-static gboolean
 engine_just_laptop_battery (GsdPowerManager *manager)
 {
         UpDevice *device;
@@ -970,7 +955,7 @@ engine_charge_action (GsdPowerManager *manager, UpDevice *device)
 
                 /* wait 20 seconds for user-panic */
                 timer_id = g_timeout_add_seconds (GSD_ACTION_DELAY,
-                                                  (GSourceFunc) manager_critical_ups_action_do_cb,
+                                                  (GSourceFunc) manager_critical_action_do_cb,
                                                   manager);
                 g_source_set_name_by_id (timer_id, "[GsdPowerManager] ups critical-action");
         }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]