From 77712e75df674fb1f6fb58bd92a26ce75cf41787 Mon Sep 17 00:00:00 2001
From: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: Tue, 26 Jul 2011 17:45:50 +0100
Subject: audio-src: add the source name to the microphone info struct

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
---
 src/empathy-audio-src.c | 2 ++
 src/empathy-audio-src.h | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index df346ea66..086b0a189 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -118,6 +118,7 @@ operation_get_microphones_free (gpointer data)
     {
       EmpathyAudioSrcMicrophone *mic = l->data;
 
+      g_free (mic->name);
       g_free (mic->description);
       g_slice_free (EmpathyAudioSrcMicrophone, mic);
     }
@@ -148,6 +149,7 @@ operation_get_microphones_cb (pa_context *context,
 
   mic = g_slice_new0 (EmpathyAudioSrcMicrophone);
   mic->index = info->index;
+  mic->name = g_strdup (info->name);
   mic->description = g_strdup (info->description);
 
   /* add it to the queue */
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index c5887237f..298d59c7d 100644
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -65,6 +65,7 @@ gdouble empathy_audio_src_get_volume (EmpathyGstAudioSrc *src);
 typedef struct
 {
   guint index;
+  gchar *name;
   gchar *description;
 } EmpathyAudioSrcMicrophone;
 
-- 
cgit v1.2.3