Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:13.1:Update
xfce4-power-manager
xfce4-power-manager-fix-brightness-type.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xfce4-power-manager-fix-brightness-type.patch of Package xfce4-power-manager
From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001 From: Martin Matuska <martin@matuska.org> Date: Tue, 23 Jul 2013 09:27:41 +0000 Subject: Change brightness level from glong to gint32 The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue. --- Index: xfce4-power-manager-1.2.0/common/xfpm-brightness.c =================================================================== --- xfce4-power-manager-1.2.0.orig/common/xfpm-brightness.c +++ xfce4-power-manager-1.2.0/common/xfpm-brightness.c @@ -92,11 +92,11 @@ out: } static gboolean -xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current) +xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current) { unsigned long nitems; unsigned long bytes_after; - long *prop; + gint32 *prop; Atom actual_type; int actual_format; gboolean ret = FALSE; @@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBr } static gboolean -xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level) +xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level) { gboolean ret = TRUE; @@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBr if ( gdk_error_trap_pop () ) { - g_warning ("failed to XRRChangeOutputProperty for brightness %li", level); + g_warning ("failed to XRRChangeOutputProperty for brightness %d", level); ret = FALSE; } @@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBright } static gboolean -xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) +xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level) { - long hw_level; + gint32 hw_level; gboolean ret = FALSE; - long set_level; + gint32 set_level; ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); @@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness if ( !ret ) { - g_warning ("xfpm_brightness_xrand_up failed for %li", set_level); + g_warning ("xfpm_brightness_xrand_up failed for %d", set_level); return FALSE; } /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { - g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level); + g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level); return FALSE; } @@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness } static gboolean -xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) +xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level) { - long hw_level; + gint32 hw_level; gboolean ret; - long set_level; + gint32 set_level; ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); @@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightne if ( !ret ) { - g_warning ("xfpm_brightness_xrand_down failed for %li", set_level); + g_warning ("xfpm_brightness_xrand_down failed for %d", set_level); return FALSE; } /* Nothing changed in the hardware*/ if ( *new_level == hw_level ) { - g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level); + g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level); return FALSE; } @@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBright } static gboolean -xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level) +xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) { int ret; @@ -406,11 +406,11 @@ out: } static gboolean -xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) +xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level) { - glong hw_level; + gint32 hw_level; gboolean ret = FALSE; - gint set_level; + gint32 set_level; ret = xfpm_brightness_helper_get_level (brightness, &hw_level); @@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightnes } static gboolean -xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level) +xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level) { - glong hw_level; + gint32 hw_level; gboolean ret; - gint set_level; + gint32 set_level; ret = xfpm_brightness_helper_get_level (brightness, &hw_level); @@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *b return FALSE; } -gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) +gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level) { gboolean ret = FALSE; @@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightn return ret; } -gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level) +gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level) { gboolean ret = FALSE; @@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (Xfpm return brightness->priv->max_level; } -gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) +gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level) { gboolean ret = FALSE; @@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (Xfpm return ret; } -gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level) +gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level) { gboolean ret = FALSE; Index: xfce4-power-manager-1.2.0/common/xfpm-brightness.h =================================================================== --- xfce4-power-manager-1.2.0.orig/common/xfpm-brightness.h +++ xfce4-power-manager-1.2.0/common/xfpm-brightness.h @@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brigh gboolean xfpm_brightness_setup (XfpmBrightness *brightness); gboolean xfpm_brightness_up (XfpmBrightness *brightness, - glong *new_level); + gint32 *new_level); gboolean xfpm_brightness_down (XfpmBrightness *brightness, - glong *new_level); + gint32 *new_level); gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness); gint xfpm_brightness_get_max_level (XfpmBrightness *brightness); gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, - glong *level); + gint32 *level); gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, - glong level); + gint32 level); gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness); Index: xfce4-power-manager-1.2.0/panel-plugins/brightness/brightness-button.c =================================================================== --- xfce4-power-manager-1.2.0.orig/panel-plugins/brightness/brightness-button.c +++ xfce4-power-manager-1.2.0/panel-plugins/brightness/brightness-button.c @@ -186,7 +186,7 @@ static gboolean brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time) { gint x, y; - glong current_level = 0; + gint32 current_level = 0; GdkDisplay *display; GdkScreen *screen; BrightnessButton *button; @@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, Brightn static void range_value_changed (GtkWidget *widget, BrightnessButton *button) { - glong range_level, hw_level; + gint32 range_level, hw_level; range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range)); @@ -428,8 +428,8 @@ brightness_button_create_popup (Brightne static void brightness_button_up (BrightnessButton *button) { - glong level; - glong max_level; + gint32 level; + gint32 max_level; xfpm_brightness_get_level (button->priv->brightness, &level); max_level = xfpm_brightness_get_max_level (button->priv->brightness); @@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton * static void brightness_button_down (BrightnessButton *button) { - glong level; + gint32 level; xfpm_brightness_get_level (button->priv->brightness, &level); if ( level != 0 ) Index: xfce4-power-manager-1.2.0/src/xfpm-backlight.c =================================================================== --- xfce4-power-manager-1.2.0.orig/src/xfpm-backlight.c +++ xfce4-power-manager-1.2.0/src/xfpm-backlight.c @@ -72,8 +72,8 @@ struct XfpmBacklightPrivate gboolean has_hw; gboolean on_battery; - glong last_level; - glong max_level; + gint32 last_level; + gint32 max_level; gboolean dimmed; gboolean block; @@ -88,7 +88,7 @@ xfpm_backlight_dim_brightness (XfpmBackl if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL ) { - glong dim_level; + gint32 dim_level; g_object_get (G_OBJECT (backlight->priv->conf), backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level, @@ -110,7 +110,7 @@ xfpm_backlight_dim_brightness (XfpmBackl **/ if (backlight->priv->last_level > dim_level) { - XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level); + XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level); backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level); } } @@ -274,7 +274,7 @@ xfpm_backlight_reset_cb (EggIdletime *id { if ( !backlight->priv->block) { - XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level); + XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level); xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level); } backlight->priv->dimmed = FALSE; @@ -284,7 +284,7 @@ xfpm_backlight_reset_cb (EggIdletime *id static void xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight) { - glong level; + gint32 level; gboolean ret = TRUE; gboolean enable_brightness, show_popup;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
