[gnome-settings-daemon] Use libgnome-volume-control from a submodule

[Bastien Nocera <hadess src gnome org>]

commit ea17ab00a35ee84ec4e7bd116bd964dcfcd1603a
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Fri Oct 19 20:45:56 2012 +0200

    Use libgnome-volume-control from a submodule
    
    To be shared with gnome-control-center and gnome-shell
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686492

 .gitmodules                                        |    3 +
 configure.ac                                       |    4 +-
 plugins/media-keys/Makefile.am                     |   14 +-
 plugins/media-keys/cut-n-paste/Makefile.am         |   42 -
 .../cut-n-paste/gvc-channel-map-private.h          |   39 -
 plugins/media-keys/cut-n-paste/gvc-channel-map.c   |  254 ---
 plugins/media-keys/cut-n-paste/gvc-channel-map.h   |   73 -
 .../cut-n-paste/gvc-mixer-card-private.h           |   35 -
 plugins/media-keys/cut-n-paste/gvc-mixer-card.c    |  515 -----
 plugins/media-keys/cut-n-paste/gvc-mixer-card.h    |   83 -
 .../cut-n-paste/gvc-mixer-control-private.h        |   35 -
 plugins/media-keys/cut-n-paste/gvc-mixer-control.c | 2253 --------------------
 plugins/media-keys/cut-n-paste/gvc-mixer-control.h |  108 -
 .../media-keys/cut-n-paste/gvc-mixer-event-role.c  |  231 --
 .../media-keys/cut-n-paste/gvc-mixer-event-role.h  |   57 -
 .../media-keys/cut-n-paste/gvc-mixer-sink-input.c  |  166 --
 .../media-keys/cut-n-paste/gvc-mixer-sink-input.h  |   57 -
 plugins/media-keys/cut-n-paste/gvc-mixer-sink.c    |  196 --
 plugins/media-keys/cut-n-paste/gvc-mixer-sink.h    |   57 -
 .../cut-n-paste/gvc-mixer-source-output.c          |  121 --
 .../cut-n-paste/gvc-mixer-source-output.h          |   57 -
 plugins/media-keys/cut-n-paste/gvc-mixer-source.c  |  196 --
 plugins/media-keys/cut-n-paste/gvc-mixer-source.h  |   57 -
 .../cut-n-paste/gvc-mixer-stream-private.h         |   34 -
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.c  | 1006 ---------
 plugins/media-keys/cut-n-paste/gvc-mixer-stream.h  |  130 --
 .../media-keys/cut-n-paste/gvc-pulseaudio-fake.h   |   34 -
 plugins/media-keys/gvc                             |    1 +
 28 files changed, 14 insertions(+), 5844 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..b193825
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "plugins/media-keys/gvc"]
+	path = plugins/media-keys/gvc
+	url = git://git.gnome.org/libgnome-volume-control
diff --git a/configure.ac b/configure.ac
index bbcb495..fa1f131 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,6 +197,8 @@ 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])
+PKG_CHECK_MODULES(GVC, [gobject-2.0 libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
+AM_CONDITIONAL(HAVE_INTROSPECTION, false)
 
 dnl ---------------------------------------------------------------------------
 dnl - xrandr plugin stuff
@@ -483,7 +485,7 @@ plugins/power/Makefile
 plugins/housekeeping/Makefile
 plugins/keyboard/Makefile
 plugins/media-keys/Makefile
-plugins/media-keys/cut-n-paste/Makefile
+plugins/media-keys/gvc/Makefile
 plugins/mouse/Makefile
 plugins/orientation/Makefile
 plugins/print-notifications/Makefile
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index bb446ea..48b27b5 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -5,7 +5,7 @@ plugin_name = media-keys
 
 NULL =
 
-SUBDIRS = cut-n-paste
+SUBDIRS = gvc
 plugin_LTLIBRARIES = libmedia-keys.la
 
 BUILT_SOURCES = 			\
@@ -35,7 +35,7 @@ libmedia_keys_la_CPPFLAGS = \
 	-I$(top_srcdir)/data/					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_srcdir)/plugins/common				\
-	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+	-I$(top_srcdir)/plugins/media-keys/gvc			\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
 	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
@@ -53,7 +53,7 @@ libmedia_keys_la_LDFLAGS = 		\
 
 libmedia_keys_la_LIBADD  = 		\
 	$(top_builddir)/plugins/common/libcommon.la			\
-	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
+	$(top_builddir)/plugins/media-keys/gvc/libgvc.la		\
 	$(MEDIA_KEYS_LIBS)						\
 	$(SETTINGS_PLUGIN_LIBS)						\
 	-lm
@@ -76,7 +76,7 @@ test_media_window_CPPFLAGS = \
 	-I$(top_srcdir)/data/					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_srcdir)/plugins/common				\
-	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+	-I$(top_srcdir)/plugins/media-keys/gvc			\
 	-DDATADIR=\""$(datadir)"\"				\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
 	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
@@ -109,7 +109,7 @@ gsd_test_media_keys_CPPFLAGS = \
 	-I$(top_srcdir)/data/					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
 	-I$(top_srcdir)/plugins/common				\
-	-I$(top_srcdir)/plugins/media-keys/cut-n-paste		\
+	-I$(top_srcdir)/plugins/media-keys/gvc			\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
 	-DGTKBUILDERDIR=\""$(pkgdatadir)"\"			\
@@ -124,8 +124,8 @@ gsd_test_media_keys_CFLAGS = \
 
 gsd_test_media_keys_LDADD = \
 	$(top_builddir)/gnome-settings-daemon/libgsd.la		\
-	$(top_builddir)/plugins/common/libcommon.la			\
-	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
+	$(top_builddir)/plugins/common/libcommon.la		\
+	$(top_builddir)/plugins/media-keys/gvc/libgvc.la	\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(MEDIA_KEYS_LIBS)			\
diff --git a/plugins/media-keys/gvc b/plugins/media-keys/gvc
new file mode 160000
index 0000000..f3df56c
--- /dev/null
+++ b/plugins/media-keys/gvc
@@ -0,0 +1 @@
+Subproject commit f3df56c399279f52b141b4a2fa3df0b08bdcec55