remove ifdefs, bump upower version requirement

Closes https://github.com/mate-desktop/mate-power-manager/pull/126

6 files changed, 1 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index ae905b1..041938b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ UNIQUE_REQUIRED=0.9.4
 LIBPANEL_REQUIRED=1.5.0
 XRANDR_REQUIRED=1.2.0
 CANBERRA_REQUIRED=0.10
-UPOWER_REQUIRED=0.9.1
+UPOWER_REQUIRED=0.9.5
 MATE_DESKTOP_REQUIRED=1.9.0
 
 dnl ----------------------------------------------------------------------------
diff --git a/src/gpm-engine.c b/src/gpm-engine.c
index 56d19e2..f1ae198 100644
--- a/src/gpm-engine.c
+++ b/src/gpm-engine.c
@@ -218,11 +218,9 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
 		warning_type = gpm_engine_get_warning_csr (engine, 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 = gpm_engine_get_warning_percentage (engine, device);
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 9024d37..b63ccb7 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -1383,7 +1383,6 @@ gpm_manager_engine_charge_low_cb (GpmEngine *engine, UpDevice *device, GpmManage
 		/* 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");
@@ -1404,7 +1403,6 @@ gpm_manager_engine_charge_low_cb (GpmEngine *engine, UpDevice *device, GpmManage
 
 		/* TRANSLATORS: tell user more details */
 		message = g_strdup_printf (_("Attached computer is low in power (%.0f%%)"), percentage);
-#endif
 	}
 
 	/* get correct icon */
@@ -1527,7 +1525,6 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
 					     "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 */
@@ -1555,7 +1552,6 @@ gpm_manager_engine_charge_critical_cb (GpmEngine *engine, UpDevice *device, GpmM
 		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 */
diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
index abafc6e..c83fe02 100644
--- a/src/gpm-prefs-core.c
+++ b/src/gpm-prefs-core.c
@@ -854,13 +854,7 @@ gpm_prefs_init (GpmPrefs *prefs)
 		g_object_unref(proxy);
 	}
 	else {
-#if UP_CHECK_VERSION(0,9,2)
 		prefs->priv->has_button_lid = up_client_get_lid_is_present (prefs->priv->client);
-#else
-		g_object_get (prefs->priv->client,
-			      "lid-is-present", &prefs->priv->has_button_lid,
-			      NULL);
-#endif
 	}
 
 	prefs->priv->has_button_suspend = TRUE;
diff --git a/src/gpm-tray-icon.c b/src/gpm-tray-icon.c
index ad44f83..fa7f5da 100644
--- a/src/gpm-tray-icon.c
+++ b/src/gpm-tray-icon.c
@@ -304,11 +304,9 @@ gpm_tray_icon_create_menu (GpmTrayIcon *icon, guint32 timestamp)
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_KEYBOARD);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_PDA);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_PHONE);
-#if UP_CHECK_VERSION(0,9,5)
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_MEDIA_PLAYER);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_TABLET);
 	dev_cnt += gpm_tray_icon_add_device (icon, menu, array, UP_DEVICE_KIND_COMPUTER);
-#endif
 	g_ptr_array_unref (array);
 
 	/* skip for things like live-cd's and GDM */
diff --git a/src/gpm-upower.c b/src/gpm-upower.c
index f659c51..744eae4 100644
--- a/src/gpm-upower.c
+++ b/src/gpm-upower.c
@@ -505,7 +505,6 @@ gpm_device_kind_to_localised_text (UpDeviceKind kind, guint number)
 		/* TRANSLATORS: cell phone (mobile...) */
 		text = ngettext ("Cell phone", "Cell phones", number);
 		break;
-#if UP_CHECK_VERSION(0,9,5)
 	case UP_DEVICE_KIND_MEDIA_PLAYER:
 		/* TRANSLATORS: media player, mp3 etc */
 		text = ngettext ("Media player", "Media players", number);
@@ -518,7 +517,6 @@ gpm_device_kind_to_localised_text (UpDeviceKind kind, guint number)
 		/* TRANSLATORS: tablet device */
 		text = ngettext ("Computer", "Computers", number);
 		break;
-#endif
 	default:
 		egg_warning ("enum unrecognised: %i", kind);
 		text = up_device_kind_to_string (kind);
@@ -558,7 +556,6 @@ gpm_device_kind_to_icon (UpDeviceKind kind)
 	case UP_DEVICE_KIND_PHONE:
 		icon = "phone";
 		break;
-#if UP_CHECK_VERSION(0,9,5)
 	case UP_DEVICE_KIND_MEDIA_PLAYER:
 		icon = "multimedia-player";
 		break;
@@ -568,7 +565,6 @@ gpm_device_kind_to_icon (UpDeviceKind kind)
 	case UP_DEVICE_KIND_COMPUTER:
 		icon = "computer-apple-ipad";
 		break;
-#endif
 	default:
 		egg_warning ("enum unrecognised: %i", kind);
 		icon = "gtk-help";