← Back to branch summary

~diwic/gnome-control-center/remove-off-profile

« back to all changes in this revision

Viewing changes to debian/patches/Brightness-fix-for-gnome-settings-daemon-changes.patch

  • Committer: Sebastien Bacher
  • Date: 2012-07-17 15:58:07 UTC
  • Revision ID: seb128@ubuntu.com-20120717155807-ql187f6xwi36nu4y
Tags: 1:3.4.2-0ubuntu0.3
releasing version 1:3.4.2-0ubuntu0.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/Brightness-fix-for-gnome-settings-daemon-changes.patch
 
1
From 1799e3f5b8eb05c1793700e8973b891c53c6b0aa Mon Sep 17 00:00:00 2001
 
2
From: Giovanni Campagna <gcampagna@src.gnome.org>
 
3
Date: Fri, 8 Jun 2012 23:01:10 +0200
 
4
Subject: [PATCH] Brightness: fix for gnome-settings-daemon changes
 
5
 
 
6
Apparently, g-s-d changed its DBus interface, and that made all
 
7
external changes to brightness invisible to the panel. Update
 
8
accordingly.
 
9
 
 
10
https://bugzilla.gnome.org/show_bug.cgi?id=662117
 
11
---
 
12
 panels/screen/cc-screen-panel.c |   54 ++++++++++++++++++++--------------------
 
13
 1 file changed, 27 insertions(+), 27 deletions(-)
 
14
 
 
15
Index: b/panels/screen/cc-screen-panel.c
 
16
===================================================================
 
17
--- a/panels/screen/cc-screen-panel.c
 
18
+++ b/panels/screen/cc-screen-panel.c
 
19
@@ -169,33 +169,6 @@ cc_screen_panel_class_finalize (CcScreen
 
20
 }
 
21
 
 
22
 static void
 
23
-on_signal (GDBusProxy *proxy,
 
24
-           gchar      *sender_name,
 
25
-           gchar      *signal_name,
 
26
-           GVariant   *parameters,
 
27
-           gpointer    user_data)
 
28
-{
 
29
-  CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
 
30
-
 
31
-  if (g_strcmp0 (signal_name, "BrightnessChanged") == 0)
 
32
-    {
 
33
-      guint brightness;
 
34
-      GtkRange *range;
 
35
-
 
36
-      /* changed, but ignoring */
 
37
-      if (self->priv->setting_brightness)
 
38
-        return;
 
39
-
 
40
-      /* update the bar */
 
41
-      g_variant_get (parameters,
 
42
-                     "(u)",
 
43
-                     &brightness);
 
44
-      range = GTK_RANGE (WID ("screen_brightness_hscale"));
 
45
-      gtk_range_set_value (range, brightness);
 
46
-    }
 
47
-}
 
48
-
 
49
-static void
 
50
 set_brightness_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 
51
 {
 
52
   GError *error = NULL;
 
53
@@ -276,6 +249,33 @@ get_brightness_cb (GObject *source_objec
 
54
 }
 
55
 
 
56
 static void
 
57
+on_signal (GDBusProxy *proxy,
 
58
+           gchar      *sender_name,
 
59
+           gchar      *signal_name,
 
60
+           GVariant   *parameters,
 
61
+           gpointer    user_data)
 
62
+{
 
63
+  CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
 
64
+
 
65
+  if (g_strcmp0 (signal_name, "Changed") == 0)
 
66
+    {
 
67
+      /* changed, but ignoring */
 
68
+      if (self->priv->setting_brightness)
 
69
+        return;
 
70
+
 
71
+      /* retrieve the value again from g-s-d */
 
72
+      g_dbus_proxy_call (self->priv->proxy,
 
73
+                         "GetPercentage",
 
74
+                         NULL,
 
75
+                         G_DBUS_CALL_FLAGS_NONE,
 
76
+                         200, /* we don't want to randomly move the bar */
 
77
+                         self->priv->cancellable,
 
78
+                         get_brightness_cb,
 
79
+                         user_data);
 
80
+    }
 
81
+}
 
82
+
 
83
+static void
 
84
 got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 
85
 {
 
86
   GError *error = NULL;