rpms/gnome-power-manager/F-12 0001-Use-gnome-settings-daemon-popup-code.patch, 1.3, 1.4 gnome-power-manager.spec, 1.181, 1.182
Bastien Nocera
hadess at fedoraproject.org
Wed Oct 28 13:55:04 UTC 2009
Author: hadess
Update of /cvs/pkgs/rpms/gnome-power-manager/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29818
Modified Files:
0001-Use-gnome-settings-daemon-popup-code.patch
gnome-power-manager.spec
Log Message:
* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
- Match gnome-settings-daemon's positioning for the OSD
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 | 108 +++-
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, 1322 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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 0001-Use-gnome-settings-daemon-popup-code.patch 28 Oct 2009 10:43:10 -0000 1.3
+++ 0001-Use-gnome-settings-daemon-popup-code.patch 28 Oct 2009 13:55:04 -0000 1.4
@@ -1,21 +1,24 @@
-From d28e419aa83da01295f7c5729e87baa55996fb11 Mon Sep 17 00:00:00 2001
+From 72cfffc3638de64192ff2323450da26e9125fb89 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
Instead of forking it.
+Also make sure the location of the popup matches
+that used by gnome-settings-daemon.
+
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 | 39 ++-
+ src/gpm-backlight.c | 108 ++++-
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, 1256 insertions(+), 796 deletions(-)
+ 8 files changed, 1322 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
@@ -107,7 +110,7 @@ index b41da1f..b038669 100644
gpm-engine.c \
$(NULL)
diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
-index 7714bcc..92ec869 100644
+index 7714bcc..5c2e453 100644
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -48,7 +48,7 @@
@@ -119,7 +122,7 @@ index 7714bcc..92ec869 100644
#include "gpm-dpms.h"
#include "gpm-idle.h"
#include "gpm-marshal.h"
-@@ -167,6 +167,25 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
+@@ -167,6 +167,88 @@ gpm_backlight_set_brightness (GpmBacklight *backlight, guint percentage, GError
}
/**
@@ -128,7 +131,7 @@ index 7714bcc..92ec869 100644
+ * Initialises the popup, and makes sure that it matches the compositing of the screen.
+ **/
+static void
-+dialog_init (GpmBacklight *backlight)
++gpm_backlight_dialog_init (GpmBacklight *backlight)
+{
+ if (backlight->priv->popup != NULL
+ && !gsd_media_keys_window_is_valid (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup))) {
@@ -142,43 +145,112 @@ index 7714bcc..92ec869 100644
+}
+
+/**
++ * gpm_backlight_dialog_show:
++ *
++ * Show the brightness popup, and place it nicely on the screen.
++ **/
++static void
++gpm_backlight_dialog_show (GpmBacklight *backlight)
++{
++ int orig_w;
++ int orig_h;
++ int screen_w;
++ int screen_h;
++ int x;
++ int y;
++ int pointer_x;
++ int pointer_y;
++ GtkRequisition win_req;
++ GdkScreen *pointer_screen;
++ GdkRectangle geometry;
++ int monitor;
++
++ /*
++ * get the window size
++ * if the window hasn't been mapped, it doesn't necessarily
++ * know its true size, yet, so we need to jump through hoops
++ */
++ gtk_window_get_default_size (GTK_WINDOW (backlight->priv->popup), &orig_w, &orig_h);
++ gtk_widget_size_request (backlight->priv->popup, &win_req);
++
++ if (win_req.width > orig_w) {
++ orig_w = win_req.width;
++ }
++ if (win_req.height > orig_h) {
++ orig_h = win_req.height;
++ }
++
++ pointer_screen = NULL;
++ gdk_display_get_pointer (gtk_widget_get_display (backlight->priv->popup),
++ &pointer_screen,
++ &pointer_x,
++ &pointer_y,
++ NULL);
++ monitor = gdk_screen_get_monitor_at_point (pointer_screen,
++ pointer_x,
++ pointer_y);
++
++ gdk_screen_get_monitor_geometry (pointer_screen,
++ monitor,
++ &geometry);
++
++ screen_w = geometry.width;
++ screen_h = geometry.height;
++
++ x = ((screen_w - orig_w) / 2) + geometry.x;
++ y = geometry.y + (screen_h / 2) + (screen_h / 2 - orig_h) / 2;
++
++ gtk_window_move (GTK_WINDOW (backlight->priv->popup), x, y);
++
++ gtk_widget_show (backlight->priv->popup);
++
++ gdk_display_sync (gtk_widget_get_display (backlight->priv->popup));
++}
++
++/**
* gpm_common_sum_scale:
*
* Finds the average between value1 and value2 set on a scale factor
-@@ -261,7 +280,9 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
+@@ -261,8 +343,10 @@ gpm_backlight_brightness_evaluate_and_set (GpmBacklight *backlight, gboolean int
/* only show dialog if interactive */
if (interactive) {
- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (float) brightness);
-+ dialog_init (backlight);
+- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_init (backlight);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+ round (brightness));
- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_show (backlight);
}
-@@ -352,7 +373,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+ 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
/* show the new value */
if (ret) {
gpm_brightness_get (backlight->priv->brightness, &percentage);
- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
-+ dialog_init (backlight);
+- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_init (backlight);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+ percentage);
- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_show (backlight);
/* save the new percentage */
backlight->priv->master_percentage = percentage;
-@@ -369,7 +392,9 @@ gpm_backlight_button_pressed_cb (GpmButton *button, const gchar *type, GpmBackli
+ }
+@@ -369,8 +455,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);
- gpm_popup_window_set_value (GPM_POPUP_WINDOW (backlight->priv->popup), (gfloat) percentage/100.0f);
-+ dialog_init (backlight);
+- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_init (backlight);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+ percentage);
- gtk_widget_show (backlight->priv->popup);
++ gpm_backlight_dialog_show (backlight);
/* save the new percentage */
backlight->priv->master_percentage = percentage;
-@@ -688,10 +713,10 @@ gpm_backlight_init (GpmBacklight *backlight)
+ }
+@@ -688,10 +776,10 @@ gpm_backlight_init (GpmBacklight *backlight)
gpm_idle_set_timeout_dim (backlight->priv->idle, backlight->priv->idle_dim_timeout);
/* use a visual widget */
@@ -992,7 +1064,7 @@ index ad3e33e..0000000
-#endif
diff --git a/src/gsd-media-keys-window.c b/src/gsd-media-keys-window.c
new file mode 100644
-index 0000000..80f4e4d
+index 0000000..cf3c726
--- /dev/null
+++ b/src/gsd-media-keys-window.c
@@ -0,0 +1,1109 @@
@@ -1853,8 +1925,8 @@ index 0000000..80f4e4d
+ draw_volume_boxes (window,
+ cr,
+ (double)window->priv->volume_level / 100.0,
-+ bright_box_x0 + 0.5,
-+ bright_box_y0 + 0.5,
++ bright_box_x0,
++ bright_box_y0,
+ bright_box_width,
+ bright_box_height);
+}
@@ -2181,5 +2253,5 @@ index 0000000..dd4ae90
+
+#endif
--
-1.6.5.rc2
+1.6.5.1
Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-12/gnome-power-manager.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- gnome-power-manager.spec 28 Oct 2009 10:53:08 -0000 1.181
+++ gnome-power-manager.spec 28 Oct 2009 13:55:04 -0000 1.182
@@ -5,7 +5,7 @@
Summary: GNOME power management service
Name: gnome-power-manager
Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?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
+* Wed Oct 28 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Match gnome-settings-daemon's positioning for the OSD
+
* Tue Oct 27 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-3
- Update OSD to match gnome-settings-daemon's
More information about the scm-commits
mailing list