Author: baggins Date: Fri Jun 4 23:18:41 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - don't reconnect to pulseaudio damon indefinitely, if it's not there for 1 minute, then just stop trying
---- Files affected: packages/gnome-settings-daemon: gnome-settings-daemon.spec (1.28 -> 1.29) , gnome-settings-daemon-pa-reconnect.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gnome-settings-daemon/gnome-settings-daemon.spec diff -u packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.28 packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.29 --- packages/gnome-settings-daemon/gnome-settings-daemon.spec:1.28 Mon Apr 26 21:23:10 2010 +++ packages/gnome-settings-daemon/gnome-settings-daemon.spec Sat Jun 5 01:18:35 2010 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Demon ustawień GNOME Name: gnome-settings-daemon Version: 2.30.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-settings-daemon/2.30/%{name}-%{version}.tar.bz2 # Source0-md5: 0a287d63b15bda50c344b3fe9a71c47e +Patch0: %{name}-pa-reconnect.patch URL: http://www.gnome.org/ BuildRequires: GConf2-devel >= 2.24.0 BuildRequires: autoconf >= 2.60 @@ -58,6 +59,7 @@ %prep %setup -q +%patch0 -p1 sed -i -e 's/e...@shaw//' po/LINGUAS rm -f po/[email protected] @@ -167,6 +169,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2010/06/04 23:18:35 baggins +- rel 2 +- don't reconnect to pulseaudio damon indefinitely, + if it's not there for 1 minute, then just stop trying + Revision 1.28 2010/04/26 19:23:10 megabajt - updated to 2.30.1 ================================================================ Index: packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch diff -u /dev/null packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch:1.1 --- /dev/null Sat Jun 5 01:18:41 2010 +++ packages/gnome-settings-daemon/gnome-settings-daemon-pa-reconnect.patch Sat Jun 5 01:18:35 2010 @@ -0,0 +1,31 @@ +--- gnome-settings-daemon-2.30.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c.orig 2009-08-24 12:20:18.000000000 +0200 ++++ gnome-settings-daemon-2.30.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c 2010-06-05 01:11:19.573632996 +0200 +@@ -44,6 +44,7 @@ + #define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate)) + + #define RECONNECT_DELAY 5 ++#define RECONNECT_TRIES 12 + + enum { + PROP_0, +@@ -57,6 +58,7 @@ + pa_context *pa_context; + int n_outstanding; + guint reconnect_id; ++ guint reconnect_nr; + char *name; + + gboolean default_sink_is_set; +@@ -1831,8 +1833,11 @@ + + case PA_CONTEXT_FAILED: + g_warning ("Connection failed, reconnecting..."); +- if (control->priv->reconnect_id == 0) ++ if ((control->priv->reconnect_id == 0) && (control->priv->reconnect_nr < RECONNECT_TRIES)) + control->priv->reconnect_id = g_timeout_add_seconds (RECONNECT_DELAY, idle_reconnect, control); ++ else if (control->priv->reconnect_nr >= RECONNECT_TRIES) ++ g_warning ("Maximum reconnection retries reached."); ++ control->priv->reconnect_nr++; + break; + + case PA_CONTEXT_TERMINATED: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-settings-daemon/gnome-settings-daemon.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
