rpms/gnome-power-manager/F-12 0001-Use-gnome-settings-daemon-popup-code.patch, 1.1, 1.2

[Bastien Nocera]

Author: hadess

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

Modified Files:
	0001-Use-gnome-settings-daemon-popup-code.patch 
Log Message:
update upstream patch

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         |   39 +
 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, 1256 insertions(+), 797 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Use-gnome-settings-daemon-popup-code.patch	27 Oct 2009 23:43:19 -0000	1.1
+++ 0001-Use-gnome-settings-daemon-popup-code.patch	28 Oct 2009 00:19:23 -0000	1.2
@@ -1,4 +1,4 @@
-From db85afd7306ba8127b38f70feff281d4c4a6a022 Mon Sep 17 00:00:00 2001
+From 06027e758cb2ae16671282e81266119d613d3349 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
@@ -8,13 +8,15 @@ Instead of forking it.
 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-popup-window.c      |  725 ----------------------------
  src/gpm-popup-window.h      |   61 ---
  src/gsd-media-keys-window.c | 1109 +++++++++++++++++++++++++++++++++++++++++++
  src/gsd-media-keys-window.h |   69 +++
- 7 files changed, 1215 insertions(+), 796 deletions(-)
+ 8 files changed, 1256 insertions(+), 796 deletions(-)
+ create mode 100644 data/acme.ui
  delete mode 100644 src/gpm-popup-window.c
  delete mode 100644 src/gpm-popup-window.h
  create mode 100644 src/gsd-media-keys-window.c
@@ -34,6 +36,53 @@ index 1a76ac8..99df812 100644
  
  EXTRA_DIST =						\
  	gnome-power-manager.schemas.in			\
+diff --git a/data/acme.ui b/data/acme.ui
+new file mode 100644
+index 0000000..3222ecb
+--- /dev/null
++++ b/data/acme.ui
+@@ -0,0 +1,41 @@
++<?xml version="1.0"?>
++<interface>
++  <!-- interface-requires gtk+ 2.6 -->
++  <!-- interface-naming-policy toplevel-contextual -->
++  <object class="GtkWindow" id="dialog">
++    <child>
++      <object class="GtkFrame" id="acme_frame">
++        <property name="visible">True</property>
++        <property name="label_xalign">0</property>
++        <property name="shadow_type">out</property>
++        <child>
++          <object class="GtkVBox" id="acme_vbox">
++            <property name="visible">True</property>
++            <property name="border_width">12</property>
++            <property name="spacing">6</property>
++            <child>
++              <object class="GtkImage" id="acme_image">
++                <property name="visible">True</property>
++                <property name="icon_name">audio-volume-high</property>
++                <property name="icon-size">6</property>
++              </object>
++              <packing>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkProgressBar" id="acme_volume_progressbar">
++                <property name="visible">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++        </child>
++      </object>
++    </child>
++  </object>
++</interface>
 diff --git a/src/Makefile.am b/src/Makefile.am
 index b41da1f..b038669 100644
 --- a/src/Makefile.am