gnome-settings-daemon-pa-reconnect.patch

   1 --- gnome-settings-daemon-3.3.90.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c.orig      2012-02-21 20:08:35.468041032 +0100
   2 +++ gnome-settings-daemon-3.3.90.1/plugins/media-keys/cut-n-paste/gvc-mixer-control.c   2012-02-21 20:53:12.920202696 +0100
   3 @@ -47,6 +47,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 @@ -60,6 +61,7 @@ struct GvcMixerControlPrivate
  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 @@ -1941,8 +1943,11 @@ _pa_context_state_cb (pa_context *contex
  20          case PA_CONTEXT_FAILED:
  21                  control->priv->state = GVC_STATE_FAILED;
  22                  g_signal_emit (control, signals[STATE_CHANGED], 0, GVC_STATE_FAILED);
  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: