[gnome-control-center/gnome-3-8] sharing: Forcefully enable the MediaExport plugin

[Bastien Nocera <hadess src gnome org>]

commit 1ae79d7d4b274c3cb10c18e79f1d1dd030dd703d
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Sep 13 23:08:34 2013 -0300

    sharing: Forcefully enable the MediaExport plugin
    
    When enabling DLNA, also make sure to enable the plugin that
    we use to export the media to the TV or set-top-box, otherwise
    rygel won't export anything.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=708055

 libgd                             |    2 +-
 panels/sharing/cc-media-sharing.c |    4 +++-
 panels/sound/gvc                  |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libgd b/libgd
index 3abc95d..94b9ec5 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 3abc95da3c5b44484aeae3c69e3701da160bf057
+Subproject commit 94b9ec5aa2ab42981397c4e39bff676273c495ec
diff --git a/panels/sharing/cc-media-sharing.c b/panels/sharing/cc-media-sharing.c
index cf3698a..55139a3 100644
--- a/panels/sharing/cc-media-sharing.c
+++ b/panels/sharing/cc-media-sharing.c
@@ -121,7 +121,8 @@ cc_media_sharing_get_preferences (gboolean   *enabled,
   file = cc_media_sharing_open_key_file ();
 
   if (enabled)
-   *enabled = g_key_file_get_boolean (file, "general", "upnp-enabled", NULL);
+   *enabled = (g_key_file_get_boolean (file, "general", "upnp-enabled", NULL) &&
+               g_key_file_get_boolean (file, "MediaExport", "enabled", NULL));
 
   if (folders)
     {
@@ -177,6 +178,7 @@ cc_media_sharing_set_preferences (gboolean   enabled,
     cc_media_sharing_disable_autostart ();
 
   g_key_file_set_boolean (file, "general", "upnp-enabled", enabled);
+  g_key_file_set_boolean (file, "MediaExport", "enabled", enabled);
 
   str_list = folders;
   length = 0;
diff --git a/panels/sound/gvc b/panels/sound/gvc
index ed0ec42..e14dbe8 160000
--- a/panels/sound/gvc
+++ b/panels/sound/gvc
@@ -1 +1 @@
-Subproject commit ed0ec4240125ac9f0a6d7502aa29644d37b2eac2
+Subproject commit e14dbe8aa6dfaeea4a9f3405cf2f3e238e88623b