Merge lp:~diwic/gnome-settings-daemon/what-did-you-plug-in into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[David Henningsson]

Hi,

Here comes the implementation of the "what did you plug in"-dialog for 14.04. While I'd like some more real-world testing before the actual merge happens (I can see to that), in parallel it would be good with some code focused review so I don't spend time polishing things if there's something with the design that you think is bad.

[David Henningsson (diwic)]

Hrm, looking at the diff below I probably did something wrong, like submitting against the wrong branch or something. Anyway, it's the file debian/patches/what-did-you-plug-in.patch in the lp:~diwic/gnome-settings-daemon/what-did-you-plug-in branch that should be looked at.

[Sebastien Bacher (seb128)]

@David: can you resubmit it (top right corner of the launchpad page) and change the target vcs to lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu?

[David Henningsson (diwic)]

Sure, done now. I notice that a new version of g-s-d was released in parallel, but hopefully that won't stop you from looking at the code - I can rebase it on top of the latest g-s-d when we feel ready quality wise.

[David Henningsson (diwic)]

Btw, I chose to implement it in the media-keys plugin instead of making a new plugin, mostly for efficiency reasons: no need to have two different connections to PulseAudio constantly up, and I save some code because I don't have to reimplement stuff like reconnecting on PA restart and such.

[Sebastien Bacher (seb128)]

Thanks for the work David, some questions/comments:

- is there any easy way to test that? I've tried plugging headphones/a microphone on my laptop but that doesn't trigger the dialog, not sure if you can easily emulate the unknown case? Having a way to display the UI at least would be nice

- we started the transition to unity-settings-daemon, can you retarget your changes against that branch (not distro patch there, it's full source)

- could you explain a bit what the code does? I tried to look at bit at the logic but I don't really know pulseaudio and things like "snd_ctl_elem_id_set_name(id, "Headset Mic Phantom Jack")" look a bit weird to me...

- pa-backend.h has commented functions, do you plan to add those back/use them? if not could you delete the lines rather than commenting them?

- > if (system("gnome-control-center sound") == -1)

better to cal "unity-control-center sound" since we are transitionning to that

- > d->settings_btn = gtk_button_new_with_label(_("Sound Settings..."));

can you replace the "..." by a their utf8 variant "…"?

- the design has a checkbox to store the choice, do you plan to add that?

- you need to list the new sources in po/POTFILES.in so the translatable strings are included in the translation template

review: Needs Fixing

[Sebastien Bacher (seb128)]

I've tweaked the source to run the UI, some extra comments:

- the "What kind of device did you plug in?" label is centered in the design and left aligned on your version

- the spacing between the Cancel/Sound Settings buttons is non standard

review: Needs Fixing

[David Henningsson (diwic)]

Hi Seb, thanks for your review! Just a few question before I start fixing the things you said:

> - is there any easy way to test that? I've tried plugging headphones/a microphone on my laptop but that doesn't
> trigger the dialog, not sure if you can easily emulate the unknown case? Having a way to display the UI at least
> would be nice

Do you think adding a local "#define DIALOGTEST" (that would pop up the dialog on any plug in or so) would do? Or do you want something that can be runtime enabled through some switch?

> - we started the transition to unity-settings-daemon, can you retarget your changes against that branch (not distro
> patch there, it's full source)

Sure, is it https://code.launchpad.net/~ubuntu-desktop/unity-greeter/unity-settings-daemon ?

> - the design has a checkbox to store the choice, do you plan to add that?

Because it requires significant additional coding (mostly in sound settings, where you need to be able to revert back to "please ask me"), I was thinking of deferring it to the next cycle, where things have to be rewritten for Qt anyway. Also, this checkbox was not present in the wireframe we got from the design team at one point, so I figured it would be a nice-to-have rather than an absolute requirement. Is that okay with you?

[Sebastien Bacher (seb128)]

> Do you think adding a local "#define DIALOGTEST" (that would pop up the dialog on any plug in or so) would do? Or do you want something that can be runtime enabled through some switch?

That would be useful, but feel free to skip over that. I basically hacked dialog-window.c to add a main() with gtk_init/gtk_run/call to dialog_create, which was enough to do a local testing

> Sure, is it https://code.launchpad.net/~ubuntu-desktop/unity-greeter/unity-settings-daemon ?

It moved teams for acl reasons, it's now https://code.launchpad.net/~unity-settings-daemon-team/unity-settings-daemon/trunk (or just use lp:unity-settings-daemon)

> Because it requires significant additional coding (mostly in sound settings, where you need to be able to revert back to "please ask me"), I was thinking of deferring it to the next cycle, where things have to be rewritten for Qt anyway. Also, this checkbox was not present in the wireframe we got from the design team at one point, so I figured it would be a nice-to-have rather than an absolute requirement. Is that okay with you?

That seems reasonable to me as well, yes.

Unmerged revisions

454. By David Henningsson on 2014-02-04

i18n + cleanup

453. By David Henningsson on 2014-02-04

Fix icons

452. By David Henningsson on 2014-01-29

and now for some actions...

451. By David Henningsson on 2014-01-29

Some more work, still unfinished

450. By David Henningsson on 2014-01-08

WIP, this is just to get the thing to compile

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-03 16:17:50 +0000
+++ debian/changelog	2014-02-06 18:04:12 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 gnome-settings-daemon (3.8.6.1-0ubuntu3) trusty; urgency=medium
 
   * debian/patches/git_hidpi_scalling.patch: 
@@ -7,6 +8,14 @@
 
  -- Sebastien Bacher <[e-mail]>  Mon, 03 Feb 2014 16:17:44 +0000
 
+=======
+gnome-settings-daemon (3.8.6.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * What-did-you-plug-in dialog
+
+ -- David Henningsson <[e-mail]>  Wed, 08 Jan 2014 14:10:30 +0100
+
+>>>>>>> MERGE-SOURCE
 gnome-settings-daemon (3.8.6.1-0ubuntu2) trusty; urgency=low
 
   * debian/patches/git_xsettings_segfaults.patch:

=== modified file 'debian/control'
--- debian/control	2013-09-09 14:21:05 +0000
+++ debian/control	2014-02-06 18:04:12 +0000
@@ -7,7 +7,7 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 9),
                gnome-pkg-tools,
@@ -28,6 +28,7 @@
                gsettings-desktop-schemas-dev (>= 3.7.2.1),
                libgnome-desktop-3-dev (>= 3.7.90),
                libpulse-dev (>= 1:2.0),
+               libasound2-dev,
                librsvg2-dev (>= 2.36.2),
                libcanberra-gtk3-dev,
                libcups2-dev,

=== modified file 'debian/control.in'
--- debian/control.in	2013-09-09 14:21:05 +0000
+++ debian/control.in	2014-02-06 18:04:12 +0000
@@ -24,6 +24,7 @@
                gsettings-desktop-schemas-dev (>= 3.7.2.1),
                libgnome-desktop-3-dev (>= 3.7.90),
                libpulse-dev (>= 1:2.0),
+               libasound2-dev,
                librsvg2-dev (>= 2.36.2),
                libcanberra-gtk3-dev,
                libcups2-dev,

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-02-03 16:17:38 +0000
+++ debian/patches/series	2014-02-06 18:04:12 +0000
@@ -28,4 +28,8 @@
 unity-modifier-media-keys.patch
 ubuntu-lid-open-reset-ideletime.patch
 git_xsettings_segfaults.patch
+<<<<<<< TREE
 git_hidpi_scalling.patch
+=======
+what-did-you-plug-in.patch
+>>>>>>> MERGE-SOURCE

=== added file 'debian/patches/what-did-you-plug-in.patch'
--- debian/patches/what-did-you-plug-in.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/what-did-you-plug-in.patch	2014-02-06 18:04:12 +0000
@@ -0,0 +1,639 @@
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/gvc/gvc-mixer-control.c
+===================================================================
+--- gnome-settings-daemon-3.8.6.1.orig/plugins/media-keys/gvc/gvc-mixer-control.c	2014-02-04 13:32:40.805078130 +0100
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/gvc/gvc-mixer-control.c	2014-02-04 13:32:40.797078130 +0100
+@@ -114,6 +114,7 @@
+         INPUT_ADDED,
+         OUTPUT_REMOVED,
+         INPUT_REMOVED,
++        CARD_INFO,
+         LAST_SIGNAL
+ };
+ 
+@@ -2150,6 +2151,10 @@
+                 }
+         }
+         g_signal_emit (G_OBJECT (control),
++                       signals[CARD_INFO],
++                       0,
++                       info);
++        g_signal_emit (G_OBJECT (control),
+                        signals[CARD_ADDED],
+                        0,
+                        info->index);
+@@ -3206,6 +3211,14 @@
+                               NULL, NULL,
+                               g_cclosure_marshal_VOID__UINT,
+                               G_TYPE_NONE, 1, G_TYPE_UINT);
++        signals [CARD_INFO] =
++                g_signal_new ("card-info",
++                              G_TYPE_FROM_CLASS (klass),
++                              G_SIGNAL_RUN_LAST,
++                              0,
++                              NULL, NULL,
++                              g_cclosure_marshal_VOID__POINTER,
++                              G_TYPE_NONE, 1, G_TYPE_POINTER);
+         signals [CARD_ADDED] =
+                 g_signal_new ("card-added",
+                               G_TYPE_FROM_CLASS (klass),
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/pa-backend.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/pa-backend.c	2014-02-04 13:39:26.137070964 +0100
+@@ -0,0 +1,235 @@
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <alsa/asoundlib.h>
++#include <pulse/pulseaudio.h>
++#include <pulse/glib-mainloop.h>
++
++#include "pa-backend.h"
++
++struct pa_backend {
++    const pa_context *context;
++    pa_backend_cb dialog_cb;
++    void *cb_userdata;
++    int headset_card;
++    bool headset_plugged_in;
++    bool has_headsetmic;
++    bool has_headphonemic;
++
++    const char *sink_port_name_to_set;
++    const char *source_port_name_to_set;
++};
++
++void pa_backend_set_context(pa_backend *p, const pa_context *c)
++{
++    p->context = c;
++}
++
++pa_backend *pa_backend_new(pa_backend_cb cb, void *cb_userdata)
++{
++    pa_backend *p = calloc(1, sizeof(*p));
++
++    if (!p)
++        return NULL;
++
++    p->headset_card = -1;
++    p->dialog_cb = cb;
++    p->cb_userdata = cb_userdata;
++    return p;
++}
++
++typedef struct headset_ports {
++    const pa_card_port_info *headphones, *headsetmic, *headphonemic;
++} headset_ports;
++
++static headset_ports get_headset_ports(const pa_card_info *c)
++{
++    headset_ports h = {NULL, NULL, NULL};
++    int i;
++    for (i = 0; i < c->n_ports; i++) {
++        pa_card_port_info *p = c->ports[i];
++        if (!strcmp(p->name, "analog-output-headphones"))
++            h.headphones = p;
++        else if (!strcmp(p->name, "analog-input-microphone-headset"))
++            h.headsetmic = p;
++        else if (!strcmp(p->name, "analog-input-microphone"))
++            h.headphonemic = p;
++    }
++    return h;
++}
++
++static bool verify_alsa_card(int cardindex, bool *headsetmic, bool *headphonemic)
++{
++    char ctlstr[20];
++    snd_hctl_t *hctl;
++    snd_ctl_elem_id_t *id;
++    int err;
++
++    *headsetmic = false;
++    *headphonemic = false;
++
++    snprintf(ctlstr, sizeof(ctlstr), "hw:%i", cardindex);
++    if ((err = snd_hctl_open(&hctl, ctlstr, 0)) < 0) {
++        g_warning("snd_hctl_open failed: %s", snd_strerror(err));
++        return false;
++    }
++
++    if ((err = snd_hctl_load(hctl)) < 0) {
++        g_warning("snd_hctl_load failed: %s", snd_strerror(err));
++        snd_hctl_close(hctl);
++        return false;
++    }
++
++    snd_ctl_elem_id_alloca(&id);
++
++    snd_ctl_elem_id_clear(id);
++    snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_CARD);
++    snd_ctl_elem_id_set_name(id, "Headphone Mic Jack");
++    if (snd_hctl_find_elem(hctl, id))
++        *headphonemic = true;
++
++    snd_ctl_elem_id_clear(id);
++    snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_CARD);
++    snd_ctl_elem_id_set_name(id, "Headset Mic Phantom Jack");
++    if (snd_hctl_find_elem(hctl, id))
++        *headsetmic = true;
++
++    if (*headphonemic) {
++        snd_ctl_elem_id_clear(id);
++        snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_CARD);
++        snd_ctl_elem_id_set_name(id, "Headset Mic Jack");
++        if (snd_hctl_find_elem(hctl, id))
++            *headsetmic = true;
++    }
++
++    snd_hctl_close(hctl);
++    return *headsetmic || *headphonemic;
++}
++
++void pa_backend_card_changed(pa_backend *p, const pa_card_info *i)
++{
++    headset_ports h;
++    bool start_dialog = false, stop_dialog = false;
++
++    h = get_headset_ports(i);
++
++    if (!h.headphones || (!h.headsetmic && !h.headphonemic))
++        return; /* Not a headset jack */
++
++    if (p->headset_card != (int) i->index) {
++        int cardindex = 0;
++        bool hsmic, hpmic;
++        const char *s = pa_proplist_gets(i->proplist, "alsa.card");
++        if (!s)
++            return;
++        cardindex = strtol(s, NULL, 10);
++        if (cardindex == 0 && strcmp(s, "0"))
++            return;
++
++        if (!verify_alsa_card(cardindex, &hsmic, &hpmic))
++            return;
++
++        p->headset_card = (int) i->index;
++        p->has_headsetmic = hsmic && h.headsetmic;
++        p->has_headphonemic = hpmic && h.headphonemic;
++    }
++    else {
++        start_dialog = p->dialog_cb && (h.headphones->available != PA_PORT_AVAILABLE_NO) &&
++            !p->headset_plugged_in;
++        stop_dialog = p->dialog_cb && (h.headphones->available == PA_PORT_AVAILABLE_NO) &&
++            p->headset_plugged_in;
++    }
++
++
++    p->headset_plugged_in = h.headphones->available != PA_PORT_AVAILABLE_NO;
++
++    if (start_dialog)
++        p->dialog_cb(p->has_headsetmic, p->has_headphonemic, p->cb_userdata);
++    else if (stop_dialog)
++        p->dialog_cb(false, false, p->cb_userdata);
++}
++
++static void sink_info_cb(pa_context *c, const pa_sink_info *i, int eol, void *userdata)
++{
++    pa_backend *p = userdata;
++    pa_operation *o;
++    int j;
++    const char *s = p->sink_port_name_to_set;
++
++    if (eol)
++        return;
++
++    if (i->card != p->headset_card)
++        return;
++
++    if (i->active_port && !strcmp(i->active_port->name, s))
++        return;
++
++    for (j = 0; j < i->n_ports; j++)
++        if (!strcmp(i->ports[j]->name, s))
++            break;
++
++    if (j >= i->n_ports)
++        return;
++
++    o = pa_context_set_sink_port_by_index(c, i->index, s, NULL, NULL);
++    if (o)
++        pa_operation_unref(o);
++}
++
++static void source_info_cb(pa_context *c, const pa_source_info *i, int eol, void *userdata)
++{
++    pa_backend *p = userdata;
++    pa_operation *o;
++    int j;
++    const char *s = p->source_port_name_to_set;
++
++    if (eol)
++        return;
++
++    if (i->card != p->headset_card)
++        return;
++
++    if (i->active_port && !strcmp(i->active_port->name, s))
++        return;
++
++    for (j = 0; j < i->n_ports; j++)
++        if (!strcmp(i->ports[j]->name, s))
++            break;
++
++    if (j >= i->n_ports)
++        return;
++
++    o = pa_context_set_source_port_by_index(c, i->index, s, NULL, NULL);
++    if (o)
++        pa_operation_unref(o);
++}
++
++
++void pa_backend_set_port(pa_backend *p, const char *portname, bool is_output)
++{
++    pa_operation *o;
++
++    if (is_output) {
++        p->sink_port_name_to_set = portname;
++        o = pa_context_get_sink_info_list(p->context, sink_info_cb, p);
++    }
++    else {
++        p->source_port_name_to_set = portname;
++        o = pa_context_get_source_info_list(p->context, source_info_cb, p);
++    }
++
++    if (o) {
++        pa_operation_unref(o);
++    }
++}
++
++
++void pa_backend_free(pa_backend *p)
++{
++    if (!p)
++        return;
++
++    free(p);
++}
++
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/pa-backend.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/pa-backend.h	2014-02-04 13:32:40.801078130 +0100
+@@ -0,0 +1,26 @@
++#ifndef __PA_BACKEND_H__
++#define __PA_BACKEND_H__
++
++#include <stdbool.h>
++#include <pulse/pulseaudio.h>
++
++typedef struct pa_backend pa_backend;
++
++typedef void (*pa_backend_cb)(bool headsetmic, bool headphonemic, void *userdata);
++
++pa_backend *pa_backend_new(pa_backend_cb cb, void *cb_userdata);
++
++//bool pa_backend_has_headset_jack(pa_backend *p);
++
++void pa_backend_free(pa_backend *p);
++
++void pa_backend_card_changed(pa_backend *p, const pa_card_info *i);
++
++void pa_backend_set_context(pa_backend *p, const pa_context *c);
++
++//void pa_backend_start_listening(pa_backend *p, pa_backend_cb cb);
++
++void pa_backend_set_port(pa_backend *p, const char *portname, bool is_output);
++
++
++#endif
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/Makefile.am
+===================================================================
+--- gnome-settings-daemon-3.8.6.1.orig/plugins/media-keys/Makefile.am	2014-02-04 13:32:40.805078130 +0100
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/Makefile.am	2014-02-04 13:32:40.801078130 +0100
+@@ -29,6 +29,8 @@
+ 	              $(srcdir)/org.gnome.ShellKeyGrabber.xml
+ 
+ libmedia_keys_la_SOURCES = 		\
++	what-did-you-plug-in/pa-backend.c \
++	what-did-you-plug-in/dialog-window.c \
+ 	gsd-media-keys-plugin.c		\
+ 	gsd-media-keys-manager.h	\
+ 	gsd-media-keys-manager.c	\
+@@ -44,6 +46,7 @@
+ 	-I$(top_srcdir)/gnome-settings-daemon			\
+ 	-I$(top_srcdir)/plugins/common				\
+ 	-I$(top_srcdir)/plugins/media-keys/gvc			\
++	-I$(top_srcdir)/plugins/media-keys/what-did-you-plug-in	\
+ 	-DBINDIR=\"$(bindir)\"					\
+ 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
+ 	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
+@@ -87,6 +90,7 @@
+ 	-I$(top_srcdir)/gnome-settings-daemon			\
+ 	-I$(top_srcdir)/plugins/common				\
+ 	-I$(top_srcdir)/plugins/media-keys/gvc			\
++	-I$(top_srcdir)/plugins/media-keys/what-did-you-plug-in	\
+ 	-DBINDIR=\"$(bindir)\"					\
+ 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
+ 	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/gsd-media-keys-manager.c
+===================================================================
+--- gnome-settings-daemon-3.8.6.1.orig/plugins/media-keys/gsd-media-keys-manager.c	2014-02-04 13:32:40.805078130 +0100
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/gsd-media-keys-manager.c	2014-02-04 13:41:02.985069252 +0100
+@@ -60,7 +60,10 @@
+ #include <canberra.h>
+ #include <pulse/pulseaudio.h>
+ #include "gvc-mixer-control.h"
++#include "gvc-mixer-control-private.h"
+ #include "gvc-mixer-sink.h"
++#include "pa-backend.h"
++#include "dialog-window.h"
+ 
+ #include <libnotify/notify.h>
+ 
+@@ -213,6 +216,8 @@
+         /* Legacy keygrabber stuff */
+         guint           have_legacy_keygrabber;
+ 
++        /* What did you plug in dialog */
++        pa_backend      *wdypi_pa_backend;
+ };
+ 
+ static void     gsd_media_keys_manager_class_init  (GsdMediaKeysManagerClass *klass);
+@@ -2683,6 +2688,64 @@
+ }
+ 
+ static void
++on_control_card_info_updated (GvcMixerControl     *control,
++                              gpointer            card_info,
++                              GsdMediaKeysManager *manager)
++{
++        pa_backend_card_changed (manager->priv->wdypi_pa_backend, card_info);
++}
++
++
++static void
++launch_sound_settings()
++{
++    if (fork() != 0)
++        return;
++
++    /* Child process */
++    if (system("gnome-control-center sound") == -1)
++        fprintf(stderr, "Failed to launch sound settings.\n");
++    exit(0);
++}
++
++static void
++on_wdypi_action (int action, void *userdata)
++{
++        GsdMediaKeysManager *manager = userdata;
++        pa_backend *pb = manager->priv->wdypi_pa_backend;
++
++        pa_backend_set_context(pb, gvc_mixer_control_get_pa_context(manager->priv->volume));
++
++        switch (action) {
++        case WDYPI_DIALOG_SOUND_SETTINGS:
++                launch_sound_settings();
++                break;
++        case WDYPI_DIALOG_HEADPHONES:
++                pa_backend_set_port(pb, "analog-output-headphones", true);
++                pa_backend_set_port(pb, "analog-input-microphone-internal", false);
++                break;
++        case WDYPI_DIALOG_HEADSET:
++                pa_backend_set_port(pb, "analog-output-headphones", true);
++                pa_backend_set_port(pb, "analog-input-microphone-headset", false);
++                break;
++        case WDYPI_DIALOG_MICROPHONE:
++                pa_backend_set_port(pb, "analog-output-speaker", true);
++                pa_backend_set_port(pb, "analog-input-microphone", false);
++                break;
++        default:
++                break;
++        }
++}
++
++static void
++on_wdypi_popup (bool hsmic, bool hpmic, void *userdata)
++{
++        if (!hpmic && !hsmic)
++                wdypi_dialog_kill();
++        else wdypi_dialog_run(hsmic, hpmic, on_wdypi_action, userdata);
++}
++
++static void
+ initialize_volume_handler (GsdMediaKeysManager *manager)
+ {
+         /* initialise Volume handler
+@@ -2695,6 +2758,8 @@
+ 
+         manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys");
+ 
++        manager->priv->wdypi_pa_backend = pa_backend_new(on_wdypi_popup, manager);
++
+         g_signal_connect (manager->priv->volume,
+                           "state-changed",
+                           G_CALLBACK (on_control_state_changed),
+@@ -2711,6 +2776,10 @@
+                           "stream-removed",
+                           G_CALLBACK (on_control_stream_removed),
+                           manager);
++        g_signal_connect (manager->priv->volume,
++                          "card-info",
++                          G_CALLBACK (on_control_card_info_updated),
++                          manager);
+ 
+         gvc_mixer_control_open (manager->priv->volume);
+ 
+@@ -3035,6 +3104,12 @@
+                 gdk_error_trap_pop_ignored ();
+         }
+ 
++        if (manager->priv->wdypi_pa_backend) {
++                pa_backend_free (manager->priv->wdypi_pa_backend);
++                manager->priv->wdypi_pa_backend = NULL;
++        }
++        wdypi_dialog_kill();
++
+         if (priv->grab_cancellable != NULL) {
+                 g_cancellable_cancel (priv->grab_cancellable);
+                 g_clear_object (&priv->grab_cancellable);
+Index: gnome-settings-daemon-3.8.6.1/configure.ac
+===================================================================
+--- gnome-settings-daemon-3.8.6.1.orig/configure.ac	2014-02-04 13:32:40.805078130 +0100
++++ gnome-settings-daemon-3.8.6.1/configure.ac	2014-02-04 13:32:40.801078130 +0100
+@@ -213,7 +213,7 @@
+ dnl - media-keys plugin stuff
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 libnotify])
++PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 libnotify alsa])
+ PKG_CHECK_MODULES(GVC, [gobject-2.0 libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
+ AM_CONDITIONAL(HAVE_INTROSPECTION, false)
+ 
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/dialog-window.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/dialog-window.c	2014-02-04 13:41:13.721069062 +0100
+@@ -0,0 +1,138 @@
++#include <glib/gi18n.h>
++#include <gtk/gtk.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
++
++#include "dialog-window.h"
++
++typedef struct dialog_window {
++    GtkWidget *dialog;
++    GtkWidget *ca_box;
++    GtkWidget *v_box;
++    GtkWidget *icon_box;
++    GtkWidget *btn_box;
++    GtkWidget *label;
++    GtkWidget *cancel_btn;
++    GtkWidget *settings_btn;
++    GtkWidget *hp_btn;
++    GtkWidget *hs_btn;
++    GtkWidget *mic_btn;
++
++    int button_response;
++    wdypi_dialog_cb cb;
++    void *cb_userdata;
++} dialog_window;
++
++/* It's okay to have a global here - we should never show more than one dialog */
++dialog_window dlg;
++
++void wdypi_dialog_kill()
++{
++    dialog_window *d = &dlg;
++    if (d->dialog) {
++        gtk_widget_destroy(d->dialog);
++        d->dialog = NULL;
++    }
++}
++
++static void on_cancel_clicked (GtkWidget *widget, gpointer data)
++{
++    dialog_window *d = data;
++    gtk_dialog_response(GTK_DIALOG(d->dialog), GTK_RESPONSE_CANCEL);
++}
++
++static void on_settings_clicked (GtkWidget *widget, gpointer data)
++{
++    dialog_window *d = data;
++    d->button_response = WDYPI_DIALOG_SOUND_SETTINGS;
++    gtk_dialog_response(GTK_DIALOG(d->dialog), GTK_RESPONSE_OK);
++}
++
++static void on_iconbtn_clicked (GtkWidget *widget, gpointer data)
++{
++    dialog_window *d = &dlg;
++    d->button_response = (ssize_t) data;
++    gtk_dialog_response(GTK_DIALOG(d->dialog), GTK_RESPONSE_OK);
++}
++
++static void on_response (GtkWidget *widget, gint response_id, gpointer data)
++{
++    dialog_window *d = data;
++    if (!d->cb)
++        return;
++
++    if (response_id == GTK_RESPONSE_OK)
++        d->cb(d->button_response, d->cb_userdata);
++    else
++        d->cb(WDYPI_DIALOG_CANCELLED, d->cb_userdata);
++
++    wdypi_dialog_kill();
++}
++
++static GtkWidget * create_icon_button(int response, const char *name, const char *icon)
++{
++    GtkWidget *btn = gtk_button_new();
++    GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
++    GtkWidget *lbl = gtk_label_new(name);
++    GtkWidget *img = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_DIALOG);
++
++    gtk_box_pack_end(GTK_BOX(box), lbl, FALSE, FALSE, 0);
++    gtk_box_pack_end(GTK_BOX(box), img, FALSE, FALSE, 0);
++    gtk_container_set_border_width(GTK_CONTAINER(box), 12);
++    gtk_container_add(GTK_CONTAINER(btn), box);
++    g_signal_connect(btn, "clicked", G_CALLBACK(on_iconbtn_clicked), (void*) (ssize_t) response);
++    return btn;
++}
++
++static void dialog_create(dialog_window *d, bool show_headset, bool show_mic)
++{
++    d->dialog = gtk_dialog_new();
++    gtk_window_set_title(GTK_WINDOW(d->dialog), _("Unknown Audio Device"));
++    gtk_container_set_border_width(GTK_CONTAINER(d->dialog), 12);
++    gtk_window_set_icon_name(GTK_WINDOW(d->dialog), "audio-headphones");
++
++    d->ca_box = gtk_dialog_get_content_area(GTK_DIALOG(d->dialog));
++    d->v_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 25);
++    d->icon_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 25);
++    gtk_box_set_homogeneous(GTK_BOX(d->icon_box), TRUE);
++    d->btn_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 25);
++
++    d->label = gtk_label_new(_("What kind of device did you plug in?"));
++    gtk_misc_set_alignment(GTK_MISC(d->label), 0, 0.5);
++    gtk_container_add(GTK_CONTAINER(d->v_box), d->label);
++
++    d->hp_btn = create_icon_button(WDYPI_DIALOG_HEADPHONES, _("Headphones"), "audio-headphones");
++    gtk_box_pack_start(GTK_BOX(d->icon_box), d->hp_btn, FALSE, TRUE, 0);
++    if (show_headset) {
++        d->hs_btn = create_icon_button(WDYPI_DIALOG_HEADSET, _("Headset"), "audio-headset");
++        gtk_box_pack_start(GTK_BOX(d->icon_box), d->hs_btn, FALSE, TRUE, 0);
++    }
++    if (show_mic) {
++        d->mic_btn = create_icon_button(WDYPI_DIALOG_MICROPHONE, _("Microphone"), "audio-input-microphone");
++        gtk_box_pack_start(GTK_BOX(d->icon_box), d->mic_btn, FALSE, TRUE, 0);
++    }
++    gtk_container_add(GTK_CONTAINER(d->v_box), d->icon_box);
++
++    d->settings_btn = gtk_button_new_with_label(_("Sound Settings..."));
++    g_signal_connect(d->settings_btn, "clicked", G_CALLBACK(on_settings_clicked), d);
++    gtk_box_pack_end(GTK_BOX(d->btn_box), d->settings_btn, FALSE, FALSE, 0);
++
++    d->cancel_btn = gtk_button_new_with_label(_("Cancel"));
++    g_signal_connect(d->cancel_btn, "clicked", G_CALLBACK(on_cancel_clicked), d);
++    gtk_box_pack_end(GTK_BOX(d->btn_box), d->cancel_btn, FALSE, FALSE, 0);
++    gtk_container_add(GTK_CONTAINER(d->v_box), d->btn_box);
++
++    gtk_container_add(GTK_CONTAINER(d->ca_box), d->v_box);
++    g_signal_connect(d->dialog, "response", G_CALLBACK(on_response), d);
++
++    gtk_widget_show_all(d->dialog);
++}
++
++void wdypi_dialog_run(bool show_headset, bool show_mic, wdypi_dialog_cb cb, void *cb_userdata)
++{
++    dialog_window *d = &dlg;
++
++    wdypi_dialog_kill();
++    d->cb = cb;
++    d->cb_userdata = cb_userdata;
++    dialog_create(d, show_headset, show_mic);
++}
+Index: gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/dialog-window.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gnome-settings-daemon-3.8.6.1/plugins/media-keys/what-did-you-plug-in/dialog-window.h	2014-02-04 13:32:40.801078130 +0100
+@@ -0,0 +1,18 @@
++#ifndef __DIALOG_WINDOW_H__
++#define __DIALOG_WINDOW_H__
++
++#include <stdbool.h>
++
++#define WDYPI_DIALOG_CANCELLED 0
++#define WDYPI_DIALOG_HEADPHONES 1
++#define WDYPI_DIALOG_HEADSET 2
++#define WDYPI_DIALOG_MICROPHONE 3
++#define WDYPI_DIALOG_SOUND_SETTINGS 4
++
++typedef void (*wdypi_dialog_cb)(int response, void *userdata);
++
++void wdypi_dialog_run(bool show_headset, bool show_mic, wdypi_dialog_cb cb, void *cb_userdata);
++
++void wdypi_dialog_kill();
++
++#endif