← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xfce4-power-manager/trusty

« back to all changes in this revision

Viewing changes to debian/patches/02_handle-weird-negative-brightness-level.patch

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2010-05-09 18:26:53 UTC
  • mfrom: (6.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100509182653-sjssv42yror533hz
Tags: 0.8.5-1ubuntu1
https://launchpad.net/bugs/437374
https://launchpad.net/bugs/507097
* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu-use-notification-icons.patch: use our notification-* icons
      for notification bubbles instead of the normal ones LP: #437374
    + xubuntu-assume-hal-is-available.patch: do not check for hal presence
      on the bus, it'll be spawned automatically on demand. lp: #507097
    + 10_pc.patch: added patched files to POTFILES.skip
    + series: created, with these two patches
  - debian/rules: add --with quilt
  - debian/control: build-depends on quilt (>= 0.46-7~)
  - debian/README.source: added.

* debian/patches/01_check-brightness-array-icon-index.patch,
  02_handle-weird-negative-brightness-level.patch: dropped, included
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_handle-weird-negative-brightness-level.patch
1
 
From b25c5a58c688476e70244980005fa596611ab59f Mon Sep 17 00:00:00 2001
2
 
From: Ali Abdallah <aliov@xfce.org>
3
 
Date: Tue, 02 Mar 2010 17:21:00 +0000
4
 
Subject: Handle weired negative brightness level reported by HAL on some systems.
5
 
 
6
 
---
7
 
diff --git a/src/xfpm-brightness-hal.c b/src/xfpm-brightness-hal.c
8
 
index 0b0c7d3..7b0c051 100644
9
 
--- a/src/xfpm-brightness-hal.c
10
 
+++ b/src/xfpm-brightness-hal.c
11
 
@@ -61,9 +61,9 @@ struct XfpmBrightnessHalPrivate
12
 
     XfpmAdapter     *adapter;
13
 
     XfpmScreenSaver *saver;
14
 
     
15
 
-    guint           max_level;
16
 
-    guint           hw_level;
17
 
-    guint           step;
18
 
+    gint            max_level;
19
 
+    gint            hw_level;
20
 
+    gint            step;
21
 
     gboolean        brightness_in_hw;
22
 
     gboolean        hw_found;
23
 
     gboolean        block;
24
 
@@ -180,6 +180,16 @@ xfpm_brightness_hal_read_hal_level (XfpmBrightnessHal *brg)
25
 
        g_warning ("Error getting brightness level: %s\n", error->message);
26
 
        g_error_free (error);
27
 
     }
28
 
+    
29
 
+    /* 
30
 
+     * Sometimes HAL send us negative values, it seems to be
31
 
+     * a bug in rounding in bash shell
32
 
+     */
33
 
+    if (brg->priv->hw_level < 0)
34
 
+    {
35
 
+       g_warning ("Negative value returned by HAL, assuming 0");
36
 
+       brg->priv->hw_level = 0;
37
 
+    }
38
 
 }
39
 
 
40
 
 static gboolean
41
 
@@ -231,7 +241,6 @@ xfpm_brightness_hal_up (XfpmBrightnessHal *brg)
42
 
     
43
 
 signal:
44
 
     xfpm_brightness_hal_read_hal_level (brg);
45
 
-    
46
 
     if ( show_popup )
47
 
        g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
48
 
 }
49
 
@@ -248,7 +257,7 @@ xfpm_brightness_hal_down (XfpmBrightnessHal *brg)
50
 
     
51
 
     if ( enable_brightness == FALSE || brg->priv->brightness_in_hw)
52
 
        goto signal;
53
 
-       
54
 
+
55
 
     if ( brg->priv->hw_level != 0)
56
 
     {
57
 
        TRACE("Brightness key down");
58
 
@@ -257,7 +266,6 @@ xfpm_brightness_hal_down (XfpmBrightnessHal *brg)
59
 
     
60
 
 signal:
61
 
     xfpm_brightness_hal_read_hal_level (brg);
62
 
-    
63
 
     if ( show_popup )
64
 
        g_signal_emit (G_OBJECT (brg), signals [BRIGHTNESS_UP], 0, brg->priv->hw_level);
65
 
 }
66
 
@@ -281,7 +289,7 @@ static void
67
 
 xfpm_brightness_hal_reset_cb (EggIdletime *idle, XfpmBrightnessHal *brg)
68
 
 {
69
 
     GError *error = NULL;
70
 
-    guint level;
71
 
+    gint level;
72
 
     
73
 
     if (brg->priv->block)
74
 
        return;
75
 
@@ -309,7 +317,7 @@ static void
76
 
 xfpm_brightness_timeout_on_ac (XfpmBrightnessHal *brg)
77
 
 {
78
 
     GError *error = NULL;
79
 
-    guint level;
80
 
+    gint level;
81
 
     
82
 
     if ( brg->priv->on_battery )
83
 
            return;
84
 
@@ -336,7 +344,7 @@ static void
85
 
 xfpm_brightness_timeout_on_battery (XfpmBrightnessHal *brg)
86
 
 {
87
 
     GError *error = NULL;
88
 
-    guint level;
89
 
+    gint level;
90
 
     
91
 
     if ( !brg->priv->on_battery )
92
 
            return;
93
 
@@ -579,14 +587,14 @@ gboolean xfpm_brightness_hal_has_hw (XfpmBrightnessHal *brg)
94
 
     return brg->priv->hw_found;
95
 
 }
96
 
 
97
 
-void xfpm_brightness_hal_update_level (XfpmBrightnessHal *brg, guint level)
98
 
+void xfpm_brightness_hal_update_level (XfpmBrightnessHal *brg, gint level)
99
 
 {
100
 
     g_return_if_fail (XFPM_IS_BRIGHTNESS_HAL (brg));
101
 
     
102
 
     brg->priv->hw_level = level;
103
 
 }
104
 
 
105
 
-guint xfpm_brightness_hal_get_max_level (XfpmBrightnessHal *brg)
106
 
+gint xfpm_brightness_hal_get_max_level (XfpmBrightnessHal *brg)
107
 
 {
108
 
     g_return_val_if_fail (XFPM_IS_BRIGHTNESS_HAL (brg), 0);
109
 
     
110
 
diff --git a/src/xfpm-brightness-hal.h b/src/xfpm-brightness-hal.h
111
 
index b574677..c7b25dc 100644
112
 
--- a/src/xfpm-brightness-hal.h
113
 
+++ b/src/xfpm-brightness-hal.h
114
 
@@ -56,9 +56,9 @@ XfpmBrightnessHal                            *xfpm_brightness_hal_new             (void);
115
 
 gboolean                                xfpm_brightness_hal_has_hw          (XfpmBrightnessHal *brg) G_GNUC_PURE;
116
 
 
117
 
 void                                    xfpm_brightness_hal_update_level    (XfpmBrightnessHal *brg,
118
 
-                                                                            guint level);
119
 
+                                                                            gint level);
120
 
 
121
 
-guint                                   xfpm_brightness_hal_get_max_level   (XfpmBrightnessHal *brg) G_GNUC_PURE;                                                                           
122
 
+gint                                    xfpm_brightness_hal_get_max_level   (XfpmBrightnessHal *brg) G_GNUC_PURE;                                                                           
123
 
 G_END_DECLS
124
 
 
125
 
 #endif /* __XFPM_BRIGHTNESS_HAL_H */
126
 
--
127
 
cgit v0.8.2.1