diff -Nru vino-3.4.2/debian/changelog vino-3.4.2/debian/changelog --- vino-3.4.2/debian/changelog 2012-05-15 20:45:20.000000000 +0000 +++ vino-3.4.2/debian/changelog 2012-06-21 16:00:12.000000000 +0000 @@ -1,3 +1,12 @@ +vino (3.4.2-0ubuntu1.1) precise-proposed; urgency=low + + * debian/patches/disable_webservices_check.patch: really disable the + connectivity check using webservices: the resulting message update was + already disabled upstream, but vino was still silently sending the requests. + (LP: #608701) + + -- Mathieu Trudel-Lapierre Thu, 21 Jun 2012 12:00:06 -0400 + vino (3.4.2-0ubuntu1) precise-proposed; urgency=low * New upstream release. diff -Nru vino-3.4.2/debian/control vino-3.4.2/debian/control --- vino-3.4.2/debian/control 2012-05-15 20:45:26.000000000 +0000 +++ vino-3.4.2/debian/control 2012-06-21 16:00:23.000000000 +0000 @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Jeremy Bicha Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), gnome-common, diff -Nru vino-3.4.2/debian/patches/disable_webservices_check.patch vino-3.4.2/debian/patches/disable_webservices_check.patch --- vino-3.4.2/debian/patches/disable_webservices_check.patch 1970-01-01 00:00:00.000000000 +0000 +++ vino-3.4.2/debian/patches/disable_webservices_check.patch 2012-06-21 15:57:38.000000000 +0000 @@ -0,0 +1,44 @@ +From: Mathieu Trudel-Lapierre +Subject: Really disable the connectivity check. +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/vino/+bug/608701 + +This was disabled upstream due to IPv4/IPv6 reachability concerns with the +implementation of the external webservices. However, it's not been totally +disabled: just the message update from the check result was removed. + +Completely disable the connectivity check so that no traffic is sent out, +since any such check done silently really isn't very nice. +--- + capplet/vino-preferences.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +Index: b/capplet/vino-preferences.c +=================================================================== +--- a/capplet/vino-preferences.c ++++ b/capplet/vino-preferences.c +@@ -382,11 +382,11 @@ vino_preferences_connect_ui (VinoPrefere + g_signal_connect (window, "response", + G_CALLBACK (vino_preferences_dialog_response), NULL); + +- app->info = vino_connectivity_info_new (gdk_screen_get_number (gtk_window_get_screen (window))); + /* Remove reporting of reachability from network to workaround GNOME bug + * 596190. + * TODO: Fix the bug and remove this workaround. */ + #if 0 ++ app->info = vino_connectivity_info_new (gdk_screen_get_number (gtk_window_get_screen (window))); + g_signal_connect (app->info, "changed", + G_CALLBACK (vino_preferences_info_changed), + gtk_builder_get_object (builder, "message")); +@@ -436,7 +436,12 @@ vino_preferences_finalize (GObject *obje + { + VinoPreferences *app = (VinoPreferences *) object; + ++/* Remove reporting of reachability from network to workaround GNOME bug ++ * 596190. ++ * TODO: Fix the bug and remove this workaround. */ ++#if 0 + g_object_unref (app->info); ++#endif + + G_OBJECT_CLASS (vino_preferences_parent_class)->finalize (object); + } diff -Nru vino-3.4.2/debian/patches/series vino-3.4.2/debian/patches/series --- vino-3.4.2/debian/patches/series 2012-05-15 20:20:02.000000000 +0000 +++ vino-3.4.2/debian/patches/series 2012-06-21 15:58:00.000000000 +0000 @@ -5,3 +5,4 @@ 11_hurd_maxhostnamelen.patch 12_app-indicators-only.patch nodisplay_autostart.patch +disable_webservices_check.patch