rpms/gnome-power-manager/F-12 0001-Use-gnome-settings-daemon-popup-code.patch, 1.4, 1.5 gnome-power-manager.spec, 1.182, 1.183

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18939

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
	gnome-power-manager.spec 
Log Message:
* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
- Fix OSD showing a volume label when switching compositing off


0001-Use-gnome-settings-daemon-popup-code.patch:
 b/data/Makefile.am            |    3 
 b/data/acme.ui                |   41 +
 b/src/Makefile.am             |    5 
 b/src/gpm-backlight.c         |  111 +++-
 b/src/gsd-media-keys-window.c | 1109 ++++++++++++++++++++++++++++++++++++++++++
 b/src/gsd-media-keys-window.h |   70 ++
 src/gpm-popup-window.c        |  725 ---------------------------
 src/gpm-popup-window.h        |   61 --
 8 files changed, 1325 insertions(+), 800 deletions(-)

Index: 0001-Use-gnome-settings-daemon-popup-code.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/0001-Use-gnome-settings-daemon-popup-code.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 13:55:04 -0000	1.4
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	29 Oct 2009 11:19:55 -0000	1.5
@@ -1,4 +1,4 @@
-From 72cfffc3638de64192ff2323450da26e9125fb89 Mon Sep 17 00:00:00 2001
+From 4d5ed37e24761f6b83f531166440ac311a5f95eb Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 27 Oct 2009 23:33:46 +0000
 Subject: [PATCH] Use gnome-settings-daemon popup code
@@ -6,19 +6,20 @@ Subject: [PATCH] Use gnome-settings-daem
 Instead of forking it.
 
 Also make sure the location of the popup matches
-that used by gnome-settings-daemon.
+that used by gnome-settings-daemon, and we switch
+styles when switching compositing on/off.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=594664
 ---
  data/Makefile.am            |    3 +-
  data/acme.ui                |   41 ++
  src/Makefile.am             |    5 +-
- src/gpm-backlight.c         |  108 ++++-
+ src/gpm-backlight.c         |  111 ++++-
  src/gpm-popup-window.c      |  725 ----------------------------
  src/gpm-popup-window.h      |   61 ---
  src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
  src/gsd-media-keys-window.h |   69 +++
- 8 files changed, 1322 insertions(+), 799 deletions(-)
+ 8 files changed, 1325 insertions(+), 799 deletions(-)
  create mode 100644 data/acme.ui
  delete mode 100644 src/gpm-popup-window.c
  delete mode 100644 src/gpm-popup-window.h
@@ -110,7 +111,7 @@ index b41da1f..b038669 100644
  	gpm-engine.c					\
  	$(NULL)
 diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
-index 7714bcc..5c2e453 100644
+index 7714bcc..8c6c236 100644
 --- a/src/gpm-backlight.c
 +++ b/src/gpm-backlight.c
 @@ -48,7 +48,7 @@
@@ -122,7 +123,7 @@ index 7714bcc..5c2e453 100644
  #include "gpm-dpms.h"
  #include "gpm-idle.h"
  #include "gpm-marshal.h"
-@@ -167,6 +167,88 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
+@@ -167,6 +167,91 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
  }
  
  /**
@@ -141,6 +142,9 @@ index 7714bcc..5c2e453 100644
 +
 +	if (backlight->priv->popup == NULL) {
 +		backlight->priv->popup= gsd_media_keys_window_new ();
++		gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
++						  GSD_MEDIA_KEYS_WINDOW_ACTION_BRIGHTNESS);
++		gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE);
 +	}
 +}
 +
@@ -211,7 +215,7 @@ index 7714bcc..5c2e453 100644
   * gpm_common_sum_scale:
   *
   * Finds the average between value1 and value2 set on a scale factor
-@@ -261,8 +343,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
+@@ -261,8 +346,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
  
  	/* only show dialog if interactive */
  	if (interactive) {
@@ -224,7 +228,7 @@ index 7714bcc..5c2e453 100644
  	}
  
  	ret = gpm_brightness_set (backlight->priv->brightness, value, &hw_changed);
-@@ -352,8 +436,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+@@ -352,8 +439,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
@@ -237,7 +241,7 @@ index 7714bcc..5c2e453 100644
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
  		}
-@@ -369,8 +455,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+@@ -369,8 +458,10 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
  		/* show the new value */
  		if (ret) {
  			gpm_brightness_get (backlight->priv->brightness, &percentage);
@@ -250,7 +254,7 @@ index 7714bcc..5c2e453 100644
  			/* save the new percentage */
  			backlight->priv->master_percentage = percentage;
  		}
-@@ -688,10 +776,10 @@ gpm_backlight_init (GpmBacklight *backlight)
+@@ -688,10 +779,10 @@ gpm_backlight_init (GpmBacklight *backlight)
  	gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
  
  	/* use a visual widget */


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gnome-power-manager.spec	28 Oct 2009 13:55:04 -0000	1.182
+++ gnome-power-manager.spec	29 Oct 2009 11:19:55 -0000	1.183
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.28.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -196,6 +196,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-5
+- Fix OSD showing a volume label when switching compositing off
+
 * Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
 - Match gnome-settings-daemon's positioning for the OSD