On 02/21/2015 08:54 PM, Vagrant Cascadian wrote:
> It seems that setting updatesUrl to an empty value might resolve the
> issue. I haven't tested it, but the following patch might work:
>
> Index: sweethome3d/src/com/eteks/sweethome3d/viewcontroller/package.properties
> ===================================================================
> ---
> sweethome3d.orig/src/com/eteks/sweethome3d/viewcontroller/package.properties
> +++ sweethome3d/src/com/eteks/sweethome3d/viewcontroller/package.properties
> @@ -122,7 +122,7 @@ HomeController.updatesMessageStyleSheet=
> .update { text-align: center; font-weight: normal; margin-bottom: 0;} \
> .releaseDateAndSize { font-size: 95%; text-align: center; margin-top: 0;
> margin-bottom: 0;} \
> .downloadPage { text-align: center; margin-top: 2px; margin-bottom: 0;}
> -HomeController.updatesUrl=http://www.sweethome3d.com/SweetHome3DUpdates.xml
> +HomeController.updatesUrl=Hi Vagrant, Thank you for looking into this and supplying a patch. I think a potential issue with blanking the updatesUrl is that if the user were to "opt-in" and want to check for updates, that the functionality would be broken. Attached is a patch that simply sets the default value of checkForUpdates to false. I have verified that for a clean install of sweethome3d, that it eliminates the automatic "phone-home" that occurs when the program starts, but allows the user to re-enable the check should it ever be desired. For users who already have the setting set to true in their preference files, they can either use the settings dialog to disable the check and preserve their other settings, or get all new default settings with: $ rm -rf ~/.java/.userPrefs/com/eteks/ $ rm -rf ~/.eteks/ Gabriele, I have this commit sitting in my local git repo; please let me know if you'd prefer to address this another way. Otherwise, I can prepare and upload and an unblock request. Cheers, tony
diff --git a/debian/changelog b/debian/changelog index 016c0b9..6fce2c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ sweethome3d (4.5+dfsg-3) UNRELEASED; urgency=medium + * Team upload. + + [ Gabriele Giacone ] * Make build reproducible, remove timestamps from PNG files. - -- Gabriele Giacone <1o5g4...@gmail.com> Wed, 17 Dec 2014 18:30:28 +0100 + [ tony mancill ] + * Set checkForUpdates=false as the default. (Closes: #778947). + + -- tony mancill <tmanc...@debian.org> Sun, 22 Feb 2015 09:40:22 -0800 sweethome3d (4.5+dfsg-2) unstable; urgency=medium diff --git a/debian/patches/05disable_checkForUpdates b/debian/patches/05disable_checkForUpdates new file mode 100644 index 0000000..d0246b0 --- /dev/null +++ b/debian/patches/05disable_checkForUpdates @@ -0,0 +1,16 @@ +diff --git a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties +index bd52fdb..a2d5fc2 100644 +--- a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties ++++ b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties +@@ -35,8 +35,8 @@ wallPattern=hatchUp + newWallThickness=7.5 + newHomeWallHeight=250 + newFloorThickness=12 +-checkUpdatesEnabled=true ++checkUpdatesEnabled=false + autoSaveDelayForRecovery=600000 + + # Uncomment default currency line to use prices in application +-# currency=EUR +\ No newline at end of file ++# currency=EUR diff --git a/debian/patches/series b/debian/patches/series index cb3b5f0..3c98a3a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 02noadditionalprovisions 03novideo 04manifest +05disable_checkForUpdates
signature.asc
Description: OpenPGP digital signature
