2008-09-28 simon.zheng <[email protected]>
authorxz159989
Sun, 28 Sep 2008 07:57:57 +0000
changeset 13802 06ec649f9274
parent 13801 ab6da2303a89
child 13803 0ef07cd323eb
2008-09-28 simon.zheng <[email protected]> * SUNWgnome-power-manager.spec: * patches/gnome-power-manager-10-brightness-progressbar.diff: Rework.
ChangeLog
SUNWgnome-power-manager.spec
patches/gnome-power-manager-10-brightness-progressbar.diff
--- a/ChangeLog	Sat Sep 27 20:30:50 2008 +0000
+++ b/ChangeLog	Sun Sep 28 07:57:57 2008 +0000
@@ -1,3 +1,8 @@
+2008-09-28  simon.zheng  <[email protected]>
+
+	* SUNWgnome-power-manager.spec:
+	* patches/gnome-power-manager-10-brightness-progressbar.diff: Rework.
+
 2008-09-27  Christian Kelly  <[email protected]>
 
 	* base-specs/libsoup.spec: Bump to 2.24.0.1.
--- a/SUNWgnome-power-manager.spec	Sat Sep 27 20:30:50 2008 +0000
+++ b/SUNWgnome-power-manager.spec	Sun Sep 28 07:57:57 2008 +0000
@@ -36,6 +36,7 @@
 Requires:                SUNWgnome-media
 BuildRequires:           SUNWgnome-media-devel
 Requires:                SUNWpostrun
+Requires:                SUNWxdg-utils
 
 %package root
 Summary:                 %{summary} - / filesystem
--- a/patches/gnome-power-manager-10-brightness-progressbar.diff	Sat Sep 27 20:30:50 2008 +0000
+++ b/patches/gnome-power-manager-10-brightness-progressbar.diff	Sun Sep 28 07:57:57 2008 +0000
@@ -18,3 +18,34 @@
  	gint step;
  	guint current_hw;
  
+--- src/gpm-brightness.c.orig	2008-09-28 14:39:43.297796000 +0800
++++ src/gpm-brightness.c	2008-09-28 14:42:19.132401000 +0800
+@@ -386,28 +386,17 @@
+ {
+ 	brightness->priv = GPM_BRIGHTNESS_GET_PRIVATE (brightness);
+ 
+-	brightness->priv->use_xrandr = FALSE;
+ 	brightness->priv->use_hal = FALSE;
+ 	brightness->priv->cache_trusted = FALSE;
+ 	brightness->priv->has_changed_events = FALSE;
+ 	brightness->priv->cache_percentage = 0;
+ 
+-	brightness->priv->xrandr = gpm_brightness_xrandr_new ();
+-	if (gpm_brightness_xrandr_has_hw (brightness->priv->xrandr)) {
+-		brightness->priv->use_xrandr = TRUE;
+-	}
+ 	brightness->priv->hal = gpm_brightness_hal_new ();
+ 	if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
+ 		brightness->priv->use_hal = TRUE;
+ 	}
+-	/* we want to default to only use XRANDR if available, as some hardware can use either */
+-	if (brightness->priv->use_xrandr) {
+-		brightness->priv->use_hal = FALSE;
+-	}
+ 	g_signal_connect (brightness->priv->hal, "brightness-changed",
+ 			  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
+-	g_signal_connect (brightness->priv->xrandr, "brightness-changed",
+-			  G_CALLBACK (gpm_brightness_xrandr_changed_cb), brightness);
+ }
+ 
+ /**