r35776 - in /desktop/unstable/gnome-control-center/debian: changelog patches/12_update_for_brightness_changed_signal.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Sep 22 18:14:12 2012
New Revision: 35776

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35776
Log:
debian/patches/12_update_for_brightness_changed_signal.patch:
gnome-settings-daemon changed its D-Bus interface for brightness changes
so external changes were invisible to the panel. Update accordingly.
Patch cherry-picked from upstream Git.

Added:
    desktop/unstable/gnome-control-center/debian/patches/12_update_for_brightness_changed_signal.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=35776&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog [utf-8] Sat Sep 22 18:14:12 2012
@@ -7,6 +7,10 @@
   * Rebuild with xz compression. Closes: #687279
   * debian/patches/11_escape_wallpaper_filename_before_display.patch: Escape
     wallpaper filename before display. Patch cherry-picked from upstream Git.
+  * debian/patches/12_update_for_brightness_changed_signal.patch:
+    gnome-settings-daemon changed its D-Bus interface for brightness changes
+    so external changes were invisible to the panel. Update accordingly.
+    Patch cherry-picked from upstream Git.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 06 Jul 2012 11:43:52 +0200
 

Added: desktop/unstable/gnome-control-center/debian/patches/12_update_for_brightness_changed_signal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/12_update_for_brightness_changed_signal.patch?rev=35776&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/12_update_for_brightness_changed_signal.patch (added)
+++ desktop/unstable/gnome-control-center/debian/patches/12_update_for_brightness_changed_signal.patch [utf-8] Sat Sep 22 18:14:12 2012
@@ -1,0 +1,48 @@
+commit 570478bcae6c872a4903118fdae25cb72cb5a027
+Author: Giovanni Campagna <gcampagna at src.gnome.org>
+Date:   Fri Jun 8 23:01:10 2012 +0200
+
+    screen: Fix for gnome-settings-daemon changes
+    
+    g-s-d changed its DBus interface, and that made all
+    external changes to brightness invisible to the panel. Update
+    accordingly.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=662117
+
+diff --git a/panels/screen/cc-screen-panel.c b/panels/screen/cc-screen-panel.c
+index 339cb29..1a0d740 100644
+--- a/panels/screen/cc-screen-panel.c
++++ b/panels/screen/cc-screen-panel.c
+@@ -177,21 +177,21 @@ on_signal (GDBusProxy *proxy,
+ {
+   CcScreenPanel *self = CC_SCREEN_PANEL (user_data);
+ 
+-  if (g_strcmp0 (signal_name, "BrightnessChanged") == 0)
++  if (g_strcmp0 (signal_name, "Changed") == 0)
+     {
+-      guint brightness;
+-      GtkRange *range;
+-
+       /* changed, but ignoring */
+       if (self->priv->setting_brightness)
+         return;
+ 
+-      /* update the bar */
+-      g_variant_get (parameters,
+-                     "(u)",
+-                     &brightness);
+-      range = GTK_RANGE (WID ("screen_brightness_hscale"));
+-      gtk_range_set_value (range, brightness);
++      /* retrieve the value again from g-s-d */
++      g_dbus_proxy_call (self->priv->proxy,
++                         "GetPercentage",
++                         NULL,
++                         G_DBUS_CALL_FLAGS_NONE,
++                         200, /* we don't want to randomly move the bar */
++                         self->priv->cancellable,
++                         get_brightness_cb,
++                         user_data);
+     }
+ }
+ 

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=35776&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series [utf-8] Sat Sep 22 18:14:12 2012
@@ -3,5 +3,6 @@
 06_handle_passwd_with_ldap.patch
 10_optional_wacom_support.patch
 11_escape_wallpaper_filename_before_display.patch
+12_update_for_brightness_changed_signal.patch
 90_force_fallback.patch
 revert_git_datetime_port.patch