diff --git a/ClickToFlash.xcodeproj/project.pbxproj b/ClickToFlash.xcodeproj/project.pbxproj index 1dd00f9a..640ba6c7 100755 --- a/ClickToFlash.xcodeproj/project.pbxproj +++ b/ClickToFlash.xcodeproj/project.pbxproj @@ -492,7 +492,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_SIGN_COMPARE = YES; - PRODUCT_VERSION = 1.5b5; + PRODUCT_VERSION = 1.5fc2; WARNING_CFLAGS = "-Wall"; }; name = Debug; @@ -505,7 +505,7 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_SIGN_COMPARE = YES; - PRODUCT_VERSION = 1.5b5; + PRODUCT_VERSION = 1.5fc2; WARNING_CFLAGS = "-Wall"; }; name = Release; diff --git a/Installer/Distribution Template.pmdoc/01clicktoflash-contents.xml b/Installer/Distribution Template.pmdoc/01clicktoflash-contents.xml deleted file mode 100644 index 7e235ae5..00000000 --- a/Installer/Distribution Template.pmdoc/01clicktoflash-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/Installer/Distribution Template.pmdoc/01clicktoflash.xml b/Installer/Distribution Template.pmdoc/01clicktoflash.xml deleted file mode 100644 index c00b3ff2..00000000 --- a/Installer/Distribution Template.pmdoc/01clicktoflash.xml +++ /dev/null @@ -1 +0,0 @@ -com.github.rentzsch.clicktoflash.admin.pkg1../build/Release/ClickToFlash.webplugin/tmpoverwriteDirectoryPermissionsallowRevertinstallToscripts.scriptsDirectoryPath.isRelativeTypeinstallTo.isAbsoluteTypeinstallTo.isRelativeTypeinstallFrom.isAbsoluteTypeextraFilesversionincludeRootidentifierparentscripts.postinstall.pathrequireAuthorizationpostInstallscripts.preflight.pathscripts.preinstall.pathscripts.postflight.pathrelocatableinstallFrom.isRelativeTypescripts.scriptsDirectoryPath.pathinstallTo.pathscripts.preinstall.isRelativeTypeinstallFrom.path../Installer/scripts/preflight../Installer/scripts/postflight01clicktoflash-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/Installer/Distribution Template.pmdoc/02clicktoflash-contents.xml b/Installer/Distribution Template.pmdoc/02clicktoflash-contents.xml deleted file mode 100644 index 7e235ae5..00000000 --- a/Installer/Distribution Template.pmdoc/02clicktoflash-contents.xml +++ /dev/null @@ -1 +0,0 @@ -modemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemodemode \ No newline at end of file diff --git a/Installer/Distribution Template.pmdoc/02clicktoflash.xml b/Installer/Distribution Template.pmdoc/02clicktoflash.xml deleted file mode 100644 index f87d7014..00000000 --- a/Installer/Distribution Template.pmdoc/02clicktoflash.xml +++ /dev/null @@ -1 +0,0 @@ -com.github.rentzsch.clicktoflash.nonadmin.pkg1../build/Release/ClickToFlash.webplugin/tmpparentscripts.postinstall.pathrequireAuthorizationinstallToscripts.preflight.pathscripts.postflight.pathscripts.preinstall.pathincludeRootinstallTo.pathidentifierinstallFrom.path../Installer/scripts/preflight../Installer/scripts/postflight02clicktoflash-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ No newline at end of file diff --git a/Installer/Distribution Template.pmdoc/index.xml b/Installer/Distribution Template.pmdoc/index.xml deleted file mode 100644 index 0410cf70..00000000 --- a/Installer/Distribution Template.pmdoc/index.xml +++ /dev/null @@ -1,5 +0,0 @@ -ClickToFlash/Users/simmy/clicktoflash+simX/Package/Package Template.mpkgcom.github.rentzsch.clicktoflash.pkgClickToFlash PackageMaker template. - -Make sure that you have the latest version of XCode when making changes as PackageMaker is generally a bit buggy. Use at least version 3.0.3. - -This package is currently configured to always install in $HOME. I didn't find a good way to let the user choose a system wide installation yet as we would always have to require admin rights.../Installer/resources/en.lproj/Background.tiff../Installer/resources/en.lproj/ReadMe.rtfClickToFlash requires MacOS X 10.5 LeopardClickToFlash cannot be used with the version of Mac OS X installed on your computer.This software can only be installed on the root volume.01clicktoflash.xml02clicktoflash.xmlproperties.userDomainproperties.anywhereDomainproperties.systemDomainproperties.customizeOptionpreinstallActions.actionsextraFilesproperties.titledescriptionpostinstallActions.actions \ No newline at end of file diff --git a/Installer/Info-admin.plist b/Installer/Info-admin.plist deleted file mode 100644 index 8b34a21b..00000000 --- a/Installer/Info-admin.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - CFBundleIdentifier - com.github.rentzsch.clicktoflash.admin.pkg - CFBundleShortVersionString - 1 - IFMajorVersion - 1 - IFMinorVersion - 0 - IFPkgFlagAllowBackRev - - IFPkgFlagAuthorizationAction - RootAuthorization - IFPkgFlagDefaultLocation - /tmp - IFPkgFlagFollowLinks - - IFPkgFlagInstallFat - - IFPkgFlagInstalledSize - 1736 - IFPkgFlagIsRequired - - IFPkgFlagOverwritePermissions - - IFPkgFlagRelocatable - - IFPkgFlagRestartAction - None - IFPkgFlagRootVolumeOnly - - IFPkgFlagUpdateInstalledLanguages - - IFPkgFormatVersion - 0.1000000014901161 - - diff --git a/Installer/Info-nonadmin.plist b/Installer/Info.plist similarity index 86% rename from Installer/Info-nonadmin.plist rename to Installer/Info.plist index 4c537db6..a51457f1 100644 --- a/Installer/Info-nonadmin.plist +++ b/Installer/Info.plist @@ -1,5 +1,5 @@ - + CFBundleIdentifier @@ -33,6 +33,6 @@ IFPkgFlagUpdateInstalledLanguages IFPkgFormatVersion - 0.1000000014901161 + 0.10000000149011612 diff --git a/Installer/build_installer_pkg.command b/Installer/build_installer_pkg.command index 92a025ee..18eb160c 100755 --- a/Installer/build_installer_pkg.command +++ b/Installer/build_installer_pkg.command @@ -20,7 +20,7 @@ fi MY_INSTALLER_ROOT="$BUILT_PRODUCTS_DIR/ClickToFlash.dst" BUILT_PLUGIN="$BUILT_PRODUCTS_DIR/ClickToFlash.webplugin" -BUILT_PKG="$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg" +BUILT_PKG="$BUILT_PRODUCTS_DIR/ClickToFlash.pkg" # Sparkle currently can't handle -$VERSION in .pkg names. VERSIONED_NAME="ClickToFlash-$PRODUCT_VERSION" BUILT_ZIP="$BUILT_PRODUCTS_DIR/$VERSIONED_NAME.zip" @@ -41,59 +41,17 @@ cp -R "$BUILT_PLUGIN" "$MY_INSTALLER_ROOT" "$SYSTEM_DEVELOPER_UTILITIES_DIR/PackageMaker.app/Contents/MacOS/PackageMaker" \ --root "$BUILT_PRODUCTS_DIR/ClickToFlash.dst" \ - --info Info-nonadmin.plist \ + --info Info.plist \ + --resources resources \ --scripts scripts \ --target 10.4 \ --version "$PRODUCT_VERSION" \ --verbose \ - --out "$BUILT_PRODUCTS_DIR/ClickToFlash-nonadmin.pkg" - -"$SYSTEM_DEVELOPER_UTILITIES_DIR/PackageMaker.app/Contents/MacOS/PackageMaker" \ - --root "$BUILT_PRODUCTS_DIR/ClickToFlash.dst" \ - --info Info-admin.plist \ - --scripts scripts \ - --target 10.4 \ - --version "$PRODUCT_VERSION" \ - --verbose \ - --out "$BUILT_PRODUCTS_DIR/ClickToFlash-admin.pkg" - - - -# go into one of the packages and strip out the contents and symbolic link them to the other -# package so that we keep the file size down, since the only difference is requiring admin auth - -cd "$BUILT_PRODUCTS_DIR/ClickToFlash-admin.pkg/Contents" -rm Archive.bom -rm Archive.pax.gz -ln -s ../../ClickToFlash-nonadmin.pkg/Contents/Archive.bom ./ -ln -s ../../ClickToFlash-nonadmin.pkg/Contents/Archive.pax.gz ./ -cd $SCRIPT_WD - - - -# make the friggin' distribution ourselves since friggin' PackageMaker friggin' doesn't friggin' support this -mkdir "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg" -mkdir "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents" -mkdir "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Packages/" -mkdir "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Resources/" -cp -R distribution-mpkg/resources/en.lproj "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Resources/en.lproj" -cp distribution-mpkg/resources/admin_privs_needed.command "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Resources/admin_privs_needed.command" -cp distribution-mpkg/resources/no_admin_privs_needed.command "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Resources/no_admin_privs_needed.command" -cp distribution-mpkg/distribution.dist "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/distribution.dist" - -cp -R "$BUILT_PRODUCTS_DIR/ClickToFlash-nonadmin.pkg" "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Packages/ClickToFlash-nonadmin.pkg" -cp -R "$BUILT_PRODUCTS_DIR/ClickToFlash-admin.pkg" "$BUILT_PRODUCTS_DIR/ClickToFlash.mpkg/Contents/Packages/ClickToFlash-admin.pkg" - - -# clean up the non-mpkg pkgs - -rm -rf "$BUILT_PRODUCTS_DIR/ClickToFlash-admin.pkg" -rm -rf "$BUILT_PRODUCTS_DIR/ClickToFlash-nonadmin.pkg" - + --out "$BUILT_PKG" # Stuff it into a .zip. cd "$BUILT_PRODUCTS_DIR" -zip -r -y "$VERSIONED_NAME.zip" "ClickToFlash.mpkg" +zip -r "$VERSIONED_NAME.zip" "ClickToFlash.pkg" cd $SCRIPT_WD rm -rf "$MY_INSTALLER_ROOT" diff --git a/Installer/distribution-mpkg/distribution.dist b/Installer/distribution-mpkg/distribution.dist deleted file mode 100644 index edf19b01..00000000 --- a/Installer/distribution-mpkg/distribution.dist +++ /dev/null @@ -1,84 +0,0 @@ - - - ClickToFlash - - - - - - - - - - - - - - - - - file:./Contents/Packages/clicktoflash-admin.pkg - file:./Contents/Packages/clicktoflash-nonadmin.pkg - \ No newline at end of file diff --git a/Installer/distribution-mpkg/resources/admin_privs_needed.command b/Installer/distribution-mpkg/resources/admin_privs_needed.command deleted file mode 100755 index 33c8d691..00000000 --- a/Installer/distribution-mpkg/resources/admin_privs_needed.command +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -cd "`dirname \"$0\"`" -SCRIPT_WD=`pwd` -DIR=/Library/Receipts/clicktoflash-nonadmin.pkg/ -SOME_GROUPS=`id -G $USER` - - -# 1 is a successful result, and requires installation with an admin password; if the result is 0, this package is unavailable - -rm -rf /tmp/ClickToFlash.webplugin - -if [ -d /tmp/ClickToFlash.webplugin ]; then - echo "we don't have privs to delete the existing temporary file, so we need admin privs to do so." - exit 1 -fi - -case `uname -r` in - [89].*) - true - ;; - *) - echo "Running on Snow Leopard or newer, no need to care." - exit 0 -esac - -if [ -d $DIR ]; then - echo "There is a receipt, no admin privs required for installer pkg." - exit 0 -fi - -if echo "$SOME_GROUPS" | egrep "^80$|^80 | 80$| 80 " > /dev/null; then - echo "User has admin privs, no admin privs required for installer pkg." - exit 0 -fi - -echo "No receipt, no admin privs, installer must ask for admin password." -exit 1 \ No newline at end of file diff --git a/Installer/distribution-mpkg/resources/no_admin_privs_needed.command b/Installer/distribution-mpkg/resources/no_admin_privs_needed.command deleted file mode 100755 index b2129223..00000000 --- a/Installer/distribution-mpkg/resources/no_admin_privs_needed.command +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -cd "`dirname \"$0\"`" -SCRIPT_WD=`pwd` -DIR=/Library/Receipts/clicktoflash-nonadmin.pkg/ -SOME_GROUPS=`id -G $USER` - - -# 1 is a successful result, and allows installation without an admin password; if the result is 0, this package is unavailable - -rm -rf /tmp/ClickToFlash.webplugin - -if [ -d /tmp/ClickToFlash.webplugin ]; then - echo "we don't have privs to delete the existing temporary file, so we will need admin privs to do so." - exit 0 -fi - -case `uname -r` in - [89].*) - true - ;; - *) - echo "Running on Snow Leopard or newer, no need to care." - exit 1 -esac - -if [ -d $DIR ]; then - echo "There is a receipt, no admin privs required for installer pkg." - exit 1 -fi - -if echo "$SOME_GROUPS" | egrep "^80$|^80 | 80$| 80 " > /dev/null; then - echo "User has admin privs, no admin privs required for installer pkg." - exit 1 -fi - -echo "No receipt, no admin privs, installer must ask for admin password." -exit 0 \ No newline at end of file diff --git a/Installer/distribution-mpkg/resources/en.lproj/ReadMe.rtf b/Installer/resources/en.lproj/ReadMe.rtf similarity index 100% rename from Installer/distribution-mpkg/resources/en.lproj/ReadMe.rtf rename to Installer/resources/en.lproj/ReadMe.rtf diff --git a/Installer/distribution-mpkg/resources/en.lproj/background.tiff b/Installer/resources/en.lproj/background.tiff similarity index 100% rename from Installer/distribution-mpkg/resources/en.lproj/background.tiff rename to Installer/resources/en.lproj/background.tiff diff --git a/Installer/scripts/postflight b/Installer/scripts/postflight index 78a29422..4c106538 100755 --- a/Installer/scripts/postflight +++ b/Installer/scripts/postflight @@ -3,13 +3,6 @@ rm -rf "$HOME/Library/Internet Plug-Ins/ClickToFlash.plugin" rm -rf "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin" mv /tmp/ClickToFlash.webplugin "$HOME/Library/Internet Plug-Ins/" -chown -R $USER "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin" -find "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin" -type d -exec chmod 755 \{} \; -find "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin" -type f -exec chmod 644 \{} \; -chmod 775 "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin/Contents/MacOS/ClickToFlash" -chmod 775 "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin/Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle" -chmod 775 "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch" -chmod 775 "$HOME/Library/Internet Plug-Ins/ClickToFlash.webplugin" pkgutil --forget com.github.rentzsch.clicktoflash.pkg -exit 0 +exit 0 \ No newline at end of file diff --git a/Plugin/CTFWhitelistWindowController.h b/Plugin/CTFWhitelistWindowController.h index 4f5cdbe8..cc1c4cc7 100755 --- a/Plugin/CTFWhitelistWindowController.h +++ b/Plugin/CTFWhitelistWindowController.h @@ -12,6 +12,7 @@ extern NSString* kCTFCheckForUpdates; } - (IBAction)checkForUpdates:(id)sender; +- (IBAction)automaticallyCheckForUpdatesDidChange:(id)sender; - (IBAction)uninstallClickToFlash:(id)sender; - (IBAction)cancelUninstall:(id)sender; diff --git a/Plugin/CTFWhitelistWindowController.m b/Plugin/CTFWhitelistWindowController.m index f56ff678..dc276465 100755 --- a/Plugin/CTFWhitelistWindowController.m +++ b/Plugin/CTFWhitelistWindowController.m @@ -29,6 +29,11 @@ - (IBAction)checkForUpdates:(id)sender; [[SparkleManager sharedManager] checkForUpdates]; } +- (IBAction)automaticallyCheckForUpdatesDidChange:(id)sender; +{ + [[SparkleManager sharedManager] setAutomaticallyChecksForUpdates:[sender state]]; +} + - (NSString *)versionString { NSBundle *CTFBundle = [NSBundle bundleWithIdentifier:@"com.github.rentzsch.clicktoflash"]; diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib index c06e4289..7fd83732 100755 --- a/Plugin/English.lproj/WhitelistPanel.xib +++ b/Plugin/English.lproj/WhitelistPanel.xib @@ -1,19 +1,14 @@ - + 1040 - 10A394 - 732 - 1027.1 - 430.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 732 - + 9L30 + 677 + 949.54 + 353.00 YES - - + YES @@ -21,7 +16,7 @@ YES - + YES @@ -44,10 +39,10 @@ 2 {{80, 187}, {527, 516}} -534248448 - ClickToFlash — Settings + Q2xpY2tUb0ZsYXNoIOKAlCBTZXR0aW5ncw NSPanel - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {420, 400} @@ -86,16 +81,16 @@ YES - 482 - 40 - 2000 + 4.820000e+02 + 4.000000e+01 + 2.000000e+03 75628096 134219776 Whitelisted Sites LucidaGrande - 11 + 1.100000e+01 3100 @@ -118,7 +113,7 @@ Text Cell LucidaGrande - 11 + 1.100000e+01 16 @@ -128,7 +123,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2OQA @@ -144,8 +139,8 @@ - 3 - 2 + 3.000000e+00 + 2.000000e+00 6 @@ -156,16 +151,13 @@ MC41AA - 17 + 1.700000e+01 1119879168 - - 2 4 15 0 YES - 0 {{1, 17}, {485, 151}} @@ -182,8 +174,8 @@ _doScroller: - 37 - 0.19473679999999999 + 3.700000e+01 + 1.947368e-01 @@ -193,7 +185,7 @@ 1 _doScroller: - 0.99764149999999996 + 9.976415e-01 @@ -231,10 +223,10 @@ 67239424 134348800 - − + 4oiSA Courier - 14 + 1.400000e+01 16 @@ -304,7 +296,7 @@ Load H.264 videos from YouTube LucidaGrande - 13 + 1.300000e+01 1044 @@ -414,8 +406,8 @@ 0 Always load (provides better typography) - 1 + 1211912703 0 @@ -425,7 +417,7 @@ YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -451,7 +443,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -523,8 +515,8 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 0 Suppress replacement (uses HTML text) - 2 + 1211912703 0 @@ -534,7 +526,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -560,7 +552,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAPcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAD3GFw cGwCAAAAbW50clJHQiBYWVogB9kAAQAHAAIADAAeYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsCh6zG+heDkCDNUtZfpGylwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -608,7 +600,7 @@ Z2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -634,7 +626,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -813,7 +805,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1280, 778}} {420, 422} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} ClickToFlash_settingsWindow @@ -854,7 +846,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -877,7 +869,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 Helvetica - 13 + 1.300000e+01 16 @@ -916,7 +908,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -955,7 +947,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Are you sure you want to uninstall ClickToFlash? LucidaGrande-Bold - 13 + 1.300000e+01 2072 @@ -984,7 +976,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1280, 778}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -996,7 +988,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} @@ -1033,7 +1025,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -1082,7 +1074,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67239424 4194304 - ClickToFlash may be installed for all users. Manually delete "ClickToFlash.webplugin" from /Library/Internet Plug-ins/ to uninstall ClickToFlash. + Q2xpY2tUb0ZsYXNoIG1heSBiZSBpbnN0YWxsZWQgZm9yIGFsbCB1c2Vycy4gIE1hbnVhbGx5IGRlbGV0 +ZSAiQ2xpY2tUb0ZsYXNoLndlYnBsdWdpbiIgZnJvbSAvTGlicmFyeS9JbnRlcm5ldCBQbHVnLWlucy8g +dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 @@ -1094,7 +1088,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1280, 778}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} 1 @@ -1106,10 +1100,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {213, 107} - + 256 YES @@ -1143,7 +1137,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -1201,11 +1195,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {461, 124} - {{0, 0}, {1280, 778}} {213, 129} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -1280,7 +1273,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA versionString NSAllowsEditingMultipleValuesSelection - + 2 @@ -1364,7 +1357,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA values.siteInfo NSHandlesContentAsCompoundValue - + 2 @@ -1480,14 +1473,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA arrangedObjects.site YES - + YES NSAllowsEditingMultipleValuesSelection NSNullPlaceholder YES - + double-click to set @@ -1512,32 +1505,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 258 + + + automaticallyCheckForUpdatesDidChange: + + + + 259 + YES 0 - + + YES + -2 - - File's Owner + + RmlsZSdzIE93bmVyA -1 - + First Responder -3 - + Application @@ -1547,7 +1550,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + 2 @@ -1566,7 +1569,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 4 - + Whitelisted Hosts @@ -1842,7 +1845,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 170 - + Plugin Defaults @@ -1880,7 +1883,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + Uninstall Confirm @@ -1973,7 +1976,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + Uninstall Failure @@ -2051,7 +2054,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + Uninstall Success @@ -2140,11 +2143,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + YES + -1.IBPluginDependency + -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect - 1.IBPluginDependency 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch @@ -2192,7 +2196,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 190.IBPluginDependency 191.IBPluginDependency 194.IBEditorWindowLastContentRect - 194.IBPluginDependency 194.IBViewEditorWindowController.showingLayoutRectangles 194.IBWindowTemplateEditedContentRect 194.ImportedFromIB2 @@ -2219,7 +2222,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 207.IBPluginDependency 21.IBPluginDependency 213.IBEditorWindowLastContentRect - 213.IBPluginDependency 213.IBViewEditorWindowController.showingLayoutRectangles 213.IBWindowTemplateEditedContentRect 213.ImportedFromIB2 @@ -2240,7 +2242,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 222.IBPluginDependency 223.IBPluginDependency 225.IBEditorWindowLastContentRect - 225.IBPluginDependency 225.IBViewEditorWindowController.showingLayoutRectangles 225.IBWindowTemplateEditedContentRect 225.ImportedFromIB2 @@ -2277,14 +2278,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{240, 125}, {527, 516}} com.apple.InterfaceBuilder.CocoaPlugin - - {{240, 125}, {527, 516}} - + com.apple.InterfaceBuilder.CocoaPlugin + {{369, 140}, {527, 516}} + + {{369, 140}, {527, 516}} + {196, 240} {{202, 428}, {480, 270}} - + {420, 400} com.apple.InterfaceBuilder.CocoaPlugin @@ -2368,26 +2370,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{97, 461}, {461, 124}} - com.apple.InterfaceBuilder.CocoaPlugin - + {{97, 461}, {461, 124}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2395,43 +2396,41 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{105, 287}, {461, 150}} - com.apple.InterfaceBuilder.CocoaPlugin - + {{105, 287}, {461, 150}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{132, 289}, {461, 124}} - com.apple.InterfaceBuilder.CocoaPlugin - + {{132, 289}, {461, 124}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2467,7 +2466,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + + YES + YES @@ -2475,13 +2476,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - + + YES + YES - 258 + 259 @@ -2499,9 +2502,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSWindowController YES - + YES approveUninstall: + automaticallyCheckForUpdatesDidChange: cancelUninstall: checkForUpdates: dismissFailureSheet: @@ -2516,11 +2520,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id YES - + YES _checkNowButton _controller @@ -2543,94 +2548,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - YES - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES ../../ClickToFlash.xcodeproj 3 diff --git a/Plugin/SparkleManager.h b/Plugin/SparkleManager.h index 4820f22a..91893259 100644 --- a/Plugin/SparkleManager.h +++ b/Plugin/SparkleManager.h @@ -39,6 +39,7 @@ - (void)startAutomaticallyCheckingForUpdates; - (void)checkForUpdates; +- (void)setAutomaticallyChecksForUpdates:(BOOL)checksForUpdates; - (NSString *)pathToRelaunch; - (void)setPathToRelaunch:(NSString *)newValue; diff --git a/Plugin/SparkleManager.m b/Plugin/SparkleManager.m index 85d2e4ae..09289646 100644 --- a/Plugin/SparkleManager.m +++ b/Plugin/SparkleManager.m @@ -110,10 +110,12 @@ - (void)startAutomaticallyCheckingForUpdates { } SUUpdater *updater = [self _updater]; - if ([[CTFUserDefaultsController standardUserDefaults] boolForKey:sAutomaticallyCheckForUpdates]) { - if (_canUpdate) { + if (_canUpdate) { + if ([[CTFUserDefaultsController standardUserDefaults] boolForKey:sAutomaticallyCheckForUpdates]) { [updater checkForUpdatesInBackground]; [updater setAutomaticallyChecksForUpdates:YES]; + } else { + [updater setAutomaticallyChecksForUpdates:NO]; } } } @@ -122,6 +124,11 @@ - (void)checkForUpdates { [[self _updater] checkForUpdates:nil]; } +- (void)setAutomaticallyChecksForUpdates:(BOOL)checksForUpdates +{ + [[self _updater] setAutomaticallyChecksForUpdates:checksForUpdates]; +} + - (NSString*)pathToRelaunchForUpdater:(SUUpdater*)updater { return _pathToRelaunch; } diff --git a/README.markdown b/README.markdown index 2effa2b6..7f5304c9 100644 --- a/README.markdown +++ b/README.markdown @@ -2,6 +2,26 @@ This page only hosts the source code for ClickToFlash. To download ClickToFlash ##Version History +* **1.5fc2** [download](http://s3.amazonaws.com/clicktoflash/ClickToFlash-1.5fc2.zip) + + * [FIX] Abandon 1.5fc1's Yet Another Installer Rework -- it causes Installer deadlocks that we can't figure out. [bug 214](http://rentzsch.lighthouseapp.com/projects/24342/tickets/214) (rentzsch) + +* **1.5fc1** [download](http://s3.amazonaws.com/clicktoflash/ClickToFlash-1.5fc1.zip) + + * [NEW] Use HTML5 `