[gnome-settings-daemon] power: Remove upower version checks



commit b1f105186bcd5cd260cdca37e01a5a190112e93f
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 16 14:48:13 2013 +0100

    power: Remove upower version checks
    
    They were checking for UPower 0.9.5 when we always require 0.9.11.

 plugins/power/gsd-power-manager.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 0762664..77a0de9 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -508,11 +508,9 @@ engine_get_warning (GsdPowerManager *manager, UpDevice *device)
                 warning_type = engine_get_warning_csr (manager, device);
 
         } else if (kind == UP_DEVICE_KIND_UPS ||
-#if UP_CHECK_VERSION(0,9,5)
                    kind == UP_DEVICE_KIND_MEDIA_PLAYER ||
                    kind == UP_DEVICE_KIND_TABLET ||
                    kind == UP_DEVICE_KIND_COMPUTER ||
-#endif
                    kind == UP_DEVICE_KIND_PDA) {
 
                 warning_type = engine_get_warning_percentage (manager, device);
@@ -1452,7 +1450,6 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device)
                 /* TRANSLATORS: tell user more details */
                 message = g_strdup_printf (_("Cell phone is low in power (%.0f%%)"), percentage);
 
-#if UP_CHECK_VERSION(0,9,5)
         } else if (kind == UP_DEVICE_KIND_MEDIA_PLAYER) {
                 /* TRANSLATORS: media player, e.g. mp3 is getting a little low */
                 title = _("Media player battery low");
@@ -1473,7 +1470,6 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device)
 
                 /* TRANSLATORS: tell user more details */
                 message = g_strdup_printf (_("Attached computer is low in power (%.0f%%)"), percentage);
-#endif
         }
 
         /* get correct icon */
@@ -1626,8 +1622,6 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device)
                 message = g_strdup_printf (_("Cell phone is very low in power (%.0f%%). "
                                              "This device will soon stop functioning if not charged."),
                                            percentage);
-
-#if UP_CHECK_VERSION(0,9,5)
         } else if (kind == UP_DEVICE_KIND_MEDIA_PLAYER) {
 
                 /* TRANSLATORS: the cell battery is very low */
@@ -1655,7 +1649,6 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device)
                 message = g_strdup_printf (_("Attached computer is very low in power (%.0f%%). "
                                              "The device will soon shutdown if not charged."),
                                            percentage);
-#endif
         }
 
         /* get correct icon */



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