rpms/gnome-settings-daemon/F-11 0001-Update-gnome-volume-control-code-from-master.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.111, 1.112

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6511

Modified Files:
	0001-Update-gnome-volume-control-code-from-master.patch 
	gnome-settings-daemon.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-11
- Fix volume code's use of g_idle_add for reconnections
  (#524398)


0001-Update-gnome-volume-control-code-from-master.patch:
 cut-n-paste/gvc-channel-map.c         |  175 ++++++++++++++++++---
 cut-n-paste/gvc-channel-map.h         |   24 ++
 cut-n-paste/gvc-mixer-control.c       |  276 +++++++++++++++++++++++++++-------
 cut-n-paste/gvc-mixer-control.h       |    1 
 cut-n-paste/gvc-mixer-event-role.c    |   29 +--
 cut-n-paste/gvc-mixer-event-role.h    |    5 
 cut-n-paste/gvc-mixer-sink-input.c    |   40 ++--
 cut-n-paste/gvc-mixer-sink.c          |   53 +++---
 cut-n-paste/gvc-mixer-source-output.c |    6 
 cut-n-paste/gvc-mixer-source.c        |   48 ++---
 cut-n-paste/gvc-mixer-stream.c        |  225 ++++++++++++++++++++++++---
 cut-n-paste/gvc-mixer-stream.h        |   23 ++
 gsd-media-keys-manager.c              |   11 -
 13 files changed, 708 insertions(+), 208 deletions(-)

Index: 0001-Update-gnome-volume-control-code-from-master.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/0001-Update-gnome-volume-control-code-from-master.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Update-gnome-volume-control-code-from-master.patch	7 Sep 2009 15:02:29 -0000	1.1
+++ 0001-Update-gnome-volume-control-code-from-master.patch	21 Sep 2009 14:59:37 -0000	1.2
@@ -714,7 +714,7 @@ index e7dd18b..92b0286 100644
 -                g_warning ("Connection failed");
 +                g_warning ("Connection failed, reconnecting...");
 +                if (control->priv->reconnect_id == 0)
-+                        control->priv->reconnect_id = g_idle_add (idle_reconnect, control);
++                        control->priv->reconnect_id = g_timeout_add_seconds (5, idle_reconnect, control);
                  break;
  
          case PA_CONTEXT_TERMINATED:


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- gnome-settings-daemon.spec	7 Sep 2009 15:23:25 -0000	1.111
+++ gnome-settings-daemon.spec	21 Sep 2009 14:59:37 -0000	1.112
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -205,6 +205,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-11
+- Fix volume code's use of g_idle_add for reconnections
+  (#524398)
+
 * Mon Sep 07 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-10
 - Update volume code from 2.27