Merge branch 'upstream'

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;

Installer/Info-nonadmin.plist → Installer/Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
@@ -33,6 +33,6 @@
 	<key>IFPkgFlagUpdateInstalledLanguages</key>
 	<false/>
 	<key>IFPkgFormatVersion</key>
-	<real>0.1000000014901161</real>
+	<real>0.10000000149011612</real>
 </dict>
 </plist>

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"

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

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;

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"];