From 2b3cf01f84204dd5d8204d519e2167b41cda6bc0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 9 Apr 2014 14:43:44 +0200 Subject: avoid "levels is 0" warning if no kbd backlight present --- src/gpm-kbd-backlight.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/gpm-kbd-backlight.c') diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index 0ac6801..a439e94 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight, guint goal; g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE); + /* avoid warnings if no keyboard brightness is available */ + if (backlight->priv->max_brightness < 1) + return FALSE; /* if we're setting the same we are, don't bother */ //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE); -- cgit v1.2.1 From d59f4b8bd38e1628af3a992ae8e96b8e069ab738 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 9 Apr 2014 15:12:17 +0200 Subject: port mate-power-manager to upower-0.99 API fix mate-power-manager for current upower versions --- src/gpm-kbd-backlight.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/gpm-kbd-backlight.c') diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index a439e94..3a0f6e6 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control, **/ static void gpm_kbd_backlight_client_changed_cb (UpClient *client, +#if UP_CHECK_VERSION(0, 99, 0) + GParamSpec *pspec, +#endif GpmKbdBacklight *backlight) { gpm_kbd_backlight_evaluate_power_source_and_set (backlight); @@ -755,8 +758,13 @@ noerr: /* Use upower for ac changed signal */ backlight->priv->client = up_client_new (); +#if UP_CHECK_VERSION(0, 99, 0) + g_signal_connect (backlight->priv->client, "notify", + G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#else g_signal_connect (backlight->priv->client, "changed", G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight); +#endif backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA); //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight); -- cgit v1.2.1