Merge lp:~rodrigo-moya/ubuntu/natty/vino/fix-31037 into lp:~ubuntu-desktop/vino/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-05 00:35:01 +0000
+++ debian/changelog	2011-03-15 18:31:27 +0000
@@ -1,3 +1,10 @@
+vino (2.32.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/03_exit-when-disabled.patch:
+    - Add patch to make vino-server exit inmediately if not enabled (LP: #31037)
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 15 Mar 2011 19:06:27 +0100
+
 vino (2.32.1-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== added file 'debian/patches/03_exit-when-disabled.patch'
--- debian/patches/03_exit-when-disabled.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_exit-when-disabled.patch	2011-03-15 18:31:27 +0000
@@ -0,0 +1,13 @@
+diff --git a/server/vino-prefs.c b/server/vino-prefs.c
+index fb9645b..b56c1b6 100644
+--- a/server/vino-prefs.c
++++ b/server/vino-prefs.c
+@@ -97,7 +97,7 @@ vino_prefs_enabled_changed (GConfClient *client,
+   if (vino_enabled)
+     vino_mdns_start (vino_network_interface);
+   else
+-    vino_mdns_stop ();
++    exit (0);
+ 
+   for (l = vino_servers; l; l = l->next)
+     vino_server_set_on_hold (l->data, !enabled);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-05 00:24:49 +0000
+++ debian/patches/series	2011-03-15 18:31:27 +0000
@@ -1,3 +1,4 @@
 01_ipv6-fix.patch
 02_server_sm-disable.patch
+03_exit-when-disabled.patch
 12_app-indicators-only.patch