gnome-settings-daemon-pa-reconnect.patch

   1 --- 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
   2 +++ gnome-settings-daemon-2.30.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c     2010-06-05 01:11:19.573632996 +0200
   3 @@ -44,6 +44,7 @@
   4  #define GVC_MIXER_CONTROL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_MIXER_CONTROL, GvcMixerControlPrivate))
   5
   6  #define RECONNECT_DELAY 5
   7 +#define RECONNECT_TRIES 12
   8
   9  enum {
  10          PROP_0,
  11 @@ -57,6 +58,7 @@
  12          pa_context       *pa_context;
  13          int               n_outstanding;
  14          guint             reconnect_id;
  15 +        guint             reconnect_nr;
  16          char             *name;
  17
  18          gboolean          default_sink_is_set;
  19 @@ -1831,8 +1833,11 @@
  20
  21          case PA_CONTEXT_FAILED:
  22                  g_warning ("Connection failed, reconnecting...");
  23 -                if (control->priv->reconnect_id == 0)
  24 +                if ((control->priv->reconnect_id == 0) && (control->priv->reconnect_nr < RECONNECT_TRIES))
  25                          control->priv->reconnect_id = g_timeout_add_seconds (RECONNECT_DELAY, idle_reconnect, control);
  26 +                else if (control->priv->reconnect_nr >= RECONNECT_TRIES)
  27 +                        g_warning ("Maximum reconnection retries reached.");
  28 +                control->priv->reconnect_nr++;
  29                  break;
  30
  31          case PA_CONTEXT_TERMINATED: