Index: /branches/uploadr/3.2/README.osx
===================================================================
--- /branches/uploadr/3.2/README.osx (revision 636)
+++ /branches/uploadr/3.2/README.osx (revision 641)
@@ -25,17 +25,6 @@
 ------------------------------------------------------------------------
 
-you'll have to build it until 1.9.1 is released
-Good luck!
-
-finish with :
-make -C obj-xulrunner/ppc/xulrunner/installer/ CHOWN_ROOT=~/UPLOADR/chown_root CHOWN_REVERT=~/UPLOADR/chown_revert
-install the resulting xulrunner-1.9.1b3pre.en-US.mac-pkg.dmg
-
-
-(rsync -rl mozilla/obj-xulrunner/ppc/dist/universal/xulrunner/XUL.framework/ MacUploadr.app/Contents/Frameworks)
-
-
-XULRunner trunk builds:
-  ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly/latest-trunk/
+Now using directly http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly/latest-mozilla-1.9.1/ instead of building it.
+http://ftp.mozilla.org/pub/mozilla.org/xulrunner/nightly/latest-mozilla-1.9.1/xulrunner-1.9.1pre.en-US.mac-pkg.dmg at the time of writing.
 
 Note: You want the version *without* 'sdk' in the name.
@@ -43,7 +32,7 @@
 Install the Mac version of XULRunner, which will live in
 /Library/Frameworks.  Then pull it into your fake Uploadr distribution:
-  $ mkdir UPLOADR/MacUploadr.app/Contents/Frameworks
-  $ sudo mv /Library/Frameworks/XUL.framework \
-    UPLOADR/MacUploadr.app/Contents/Frameworks
+  $ mkdir UPLOADR/MacUploadr.app/Contents/Frameworks/XUL.framework
+  $ sudo mv /Library/Frameworks/XUL.framework/Versions/Current/* \
+    UPLOADR/MacUploadr.app/Contents/Frameworks/XUL.framework/
 
 Install MacPorts if you haven't already:
@@ -95,5 +84,5 @@
 ------------------------------------------------------------------------
 Because of dynamic/static linker weirdness, before building GraphicsMagick,
-and Exiv, move libintl.dylibout of the way:
+and Exiv, move libintl.dylib out of the way:
   $ sudo mv /opt/local/lib/libintl.dylib /opt/local/lib/libintl.dylib.sav
 you might need to do that for all the versions of libintl you have on your system
@@ -107,5 +96,5 @@
   $ sudo port install libpng
 
-in trunk, using 1.2.5 release
+to match the site, using 1.3.5 release
 
 Configure and install GraphicsMagick:
@@ -143,5 +132,4 @@
   $ sudo port install libiconv
   $ sudo port install expat
-  $ sudo port install xml2
   $ ./configure --prefix=/opt/local --disable-shared --with-expat=/opt/local
   $ make && sudo make install
@@ -151,5 +139,4 @@
   $ sudo mv /opt/local/lib/libiconv.dylib /opt/local/lib/libiconv.dylib.sav
   $ sudo mv /opt/local/lib/libexpat.dylib /opt/local/lib/libexpat.dylib.sav
-  $ sudo mv /opt/local/lib/libxml2.dylib /opt/local/lib/libxml2.dylib.sav ???
 
 
@@ -163,8 +150,26 @@
 Then build:
   $ ./configure --disable-ffserver --disable-ffplay --enable-gpl \
-	--disable-vhook --disable-mmx --enable-static --disable-shared  \
-	--extra-cflags=-fno-common --disable-debug --enable-swscale
+	--disable-mmx --enable-static --disable-shared  \
+	--extra-cflags=-fno-common --disable-debug
   $ make && sudo make install
 
+On Mac OS X 10.4 you may encounter:
+
+make(6189) malloc: *** vm_allocate(size=4272951296) failed (error code=3) 
+make(6189) malloc: *** error: can't allocate region 
+make(6189) malloc: *** set a breakpoint in szone_error to debug 
+make: *** virtual memory exhausted.  Stop. 
+
+$ which make 
+/usr/bin/make 
+$ make --version 
+GNU Make 3.80 
+	 	 
+port install gmake 
+$ which gmake 
+/opt/local/bin/gmake 
+$ gmake --version 
+GNU Make 3.81 
+and used gmake instead of make
 
 Building XPCOM components
@@ -191,6 +196,5 @@
 Running Flickr Uploadr
 ------------------------------------------------------------------------
-//cp MacUploadr.app/Contents/Frameworks/Versions/1.9..../xulrunner-bin MacUploadr.app/Contents/MacOS/xulrunner ???
-// Actually do not put Versions subdirectory or auto-update won't work (forces to use symlink)
+cp MacUploadr.app/Contents/Frameworks/XUL.framework/xulrunner MacUploadr.app/Contents/MacOS/xulrunner
 
 The app can be launched by double-clicking on MacUploadr.app in Finder.
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Info.plist
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Info.plist (revision 636)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Info.plist (revision 641)
@@ -1,10 +1,8 @@
 <?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>CFBundleDevelopmentRegion</key>
 	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>xulrunner</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
@@ -60,6 +58,10 @@
 		</dict>
 	</array>
+	<key>CFBundleExecutable</key>
+	<string>xulrunner</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Flickr Uploadr 3.2.1, (c) Yahoo!, Inc.</string>
+	<key>CFBundleIconFile</key>
+	<string>icons.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.flickr.uploadr</string>
@@ -71,17 +73,16 @@
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>FLUP</string>
-	<key>CFBundleIconFile</key>
-	<string>icons.icns</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>Flickr Uploadr</string>
+			<string>com.flickr.uploadr</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>chrome</string>
+				<string>flickrup</string>
 			</array>
 		</dict>
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/modules.mgk
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/modules.mgk (revision 641)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/modules.mgk (revision 641)
@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<modulemap>
+  <module magick="8BIM" name="META" />
+  <module magick="8BIMTEXT" name="META" />
+  <module magick="8BIMWTEXT" name="META" />
+  <module magick="AFM" name="TTF" />
+  <module magick="APP1" name="META" />
+  <module magick="APP1JPEG" name="META" />
+  <module magick="B" name="GRAY" />
+  <module magick="BIE" name="JBIG" />
+  <module magick="C" name="GRAY" />
+  <module magick="CIN" name="CINEON" />
+  <module magick="CUR" name="ICON" />
+  <module magick="DCX" name="PCX" />
+  <module magick="EMF" name="EMF" />
+  <module magick="EPDF" name="PDF" />
+  <module magick="EPI" name="PS" />
+  <module magick="EPS" name="PS" />
+  <module magick="EPSF" name="PS" />
+  <module magick="EPSI" name="PS" />
+  <module magick="EPS2" name="PS2" />
+  <module magick="EPS3" name="PS3" />
+  <module magick="EXIF" name="META" />
+  <module magick="FILE" name="URL" />
+  <module magick="FRACTAL" name="PLASMA" />
+  <module magick="FTP" name="URL" />
+  <module magick="G" name="GRAY" />
+  <module magick="G3" name="FAX" />
+  <module magick="GIF87" name="GIF" />
+  <module magick="GRANITE" name="LOGO" />
+  <module magick="H" name="LOGO" />
+  <module magick="H5" name="HDF" />
+  <module magick="HTM" name="HTML" />
+  <module magick="HTTP" name="URL" />
+  <module magick="ICB" name="TGA" />
+  <module magick="ICC" name="META" />
+  <module magick="ICM" name="META" />
+  <module magick="ICO" name="ICON" />
+  <module magick="IMAGE" name="LOGO" />
+  <module magick="IMPLICIT" name="MIFF" />
+  <module magick="IPTC" name="META" />
+  <module magick="IPTCTEXT" name="META" />
+  <module magick="IPTCWTEXT" name="META" />
+  <module magick="JBG" name="JBIG" />
+  <module magick="JNG" name="PNG" />
+  <module magick="JPC" name="JP2" />
+  <module magick="JPG" name="JPEG" />
+  <module magick="K" name="GRAY" />
+  <module magick="M" name="GRAY" />
+  <module magick="M2V" name="MPEG" />
+  <module magick="MNG" name="PNG" />
+  <module magick="MPG" name="MPEG" />
+  <module magick="MPRI" name="MPR" />
+  <module magick="NETSCAPE" name="LOGO" />
+  <module magick="O" name="GRAY" />
+  <module magick="P7" name="PNM" />
+  <module magick="PAL" name="UYVY" />
+  <module magick="PATTERN" name="LOGO" />
+  <module magick="PBM" name="PNM" />
+  <module magick="PCDS" name="PCD" />
+  <module magick="PCT" name="PICT" />
+  <module magick="PFA" name="TTF" />
+  <module magick="PFB" name="TTF" />
+  <module magick="PFM" name="TTF" />
+  <module magick="PGM" name="PNM" />
+  <module magick="PGX" name="JP2" />
+  <module magick="PICON" name="XPM" />
+  <module magick="PM" name="XPM" />
+  <module magick="PNG8" name="PNG" />
+  <module magick="PNG24" name="PNG" />
+  <module magick="PNG32" name="PNG" />
+  <module magick="PPM" name="PNM" />
+  <module magick="PSD" name="PSD" />
+  <module magick="PTIF" name="TIFF" />
+  <module magick="R" name="GRAY" />
+  <module magick="RAS" name="SUN" />
+  <module magick="RGBA" name="RGB" />
+  <module magick="ROSE" name="LOGO" />
+  <module magick="SHTML" name="HTML" />
+  <module magick="SVGZ" name="SVG" />
+  <module magick="TEXT" name="TXT" />
+  <module magick="TIF" name="TIFF" />
+  <module magick="VDA" name="TGA" />
+  <module magick="VST" name="TGA" />
+  <module magick="WMFWIN32" name="EMF" />
+  <module magick="XMP" name="META" />
+  <module magick="XTRNARRAY" name="XTRN" />
+  <module magick="XTRNBSTR" name="XTRN" />
+  <module magick="XV" name="VIFF" />
+  <module magick="Y" name="GRAY" />
+</modulemap>
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/delegates.mgk
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/delegates.mgk (revision 641)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/delegates.mgk (revision 641)
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<!--
+  Delegate command file.
+
+  Commands which specify
+
+    decode="in_format" encode="out_format"
+
+  specify the rules for converting from in_format to out_format
+  These rules may be used to translate directly between formats.
+
+  Commands which specify only
+
+    decode="in_format"
+
+  specify the rules for converting from in_format to some format that
+  GraphicsMagick will automatically recognize. These rules are used to
+  decode formats.
+
+  Commands which specify only
+
+   encode="out_format"
+
+  specify the rules for an "encoder" which may accept any input format.
+
+  For delegates other than gs-color, gs-mono, and mpeg-encode
+  the substitution rules are as follows:
+
+    %i  input image filename
+    %o  output image filename
+    %u  unique temporary filename
+    %z  secondary unique temporary filename
+
+    %#  input image signature
+    %b  image file size
+    %c  input image comment
+    %d  original filename directory part
+    %e  original filename extension part
+    %f  original filename
+    %t  original filename top (base) part
+    %g  window group
+    %h  image rows (height)
+    %k  input image number colors
+    %l  input image label
+    %m  input image format ("magick")
+    %n  input image number of scenes
+    %p  page number
+    %q  input image depth
+    %r  input image storage class, colorspace, and matte
+    %s  scene number
+    %w  image columns (width)
+    %x  input image x resolution
+    %y  input image y resolution
+    %[  input image attribute (e.g. "%[EXIF:Orientation]")
+    %%  pass through literal %
+
+  Under Unix, all text (non-numeric) substitutions should be
+  surrounded with double quotes for the purpose of security, and
+  because any double quotes occuring within the substituted text will
+  be escaped using a backslash.
+
+  Commands (excluding file names) containing one or more of the
+  special characters ";&|><" (requiring that multiple processes be
+  executed) are executed via the Unix shell with text substitutions
+  carefully excaped to avoid possible compromise.  Otherwise, commands
+  are executed directly without use of the Unix shell.
+
+  Use 'gm convert -list delegates' to verify how the contents of this
+  file has been parsed.
+
+ -->
+<delegatemap>
+  <delegate decode="autotrace" stealth="True" command='"autotrace" -output-format svg -output-file "%o" "%i"' />
+  <delegate decode="browse" stealth="True" command='"mozilla" "http://www.GraphicsMagick.org/" &'  />
+  <delegate decode="cgm" command='"ralcgm" -d ps < "%i" > "%o" 2>/dev/null' />
+  <delegate decode="dcraw" command='"dcraw" -c -w "%i" > "%o"' />
+  <delegate decode="dot" command='"dot" -Tps "%i" -o "%o"' />
+  <delegate decode="dvi" command='"dvips" -q -o "%o" "%i"' />
+  <delegate decode="edit" stealth="True" command='"xterm" -title "Edit Image Comment" -e vi "%o"' />
+  <delegate decode="emf" command='"wmf2eps" -o "%o" "%i"' />
+  <delegate decode="eps" encode="pdf" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pdfwrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <delegate decode="eps" encode="ps" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pswrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <delegate decode="fig" command='"fig2dev" -L ps "%i" "%o"' />
+  <delegate decode="gplt" command='"echo" "set size 1.25,0.62; set terminal postscript portrait color solid; set output "%o"; load "%i"" > "%u"; "gnuplot" "%u"' />
+
+  <!-- Read monochrome Postscript, EPS, and PDF  -->
+  <delegate decode="gs-mono" stealth="True" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pbmraw -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -g%s -r%s %s "-sOutputFile=%s" -- "%s" -c quit' />
+
+  <!-- Read grayscale Postscript, EPS, and PDF  -->
+  <delegate decode="gs-gray" stealth="True" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pgmraw -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -g%s -r%s %s "-sOutputFile=%s" -- "%s" -c quit' />
+
+  <!-- Read color Postscript, EPS, and PDF  -->
+  <delegate decode="gs-color" stealth="True" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=ppmraw -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -g%s -r%s %s "-sOutputFile=%s" -- "%s" -c quit' />
+
+  <!-- Read color+alpha Postscript, EPS, and PDF  -->
+  <delegate decode="gs-color+alpha" stealth="True" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pngalpha -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -g%s -r%s %s "-sOutputFile=%s" -- "%s" -c quit' />
+
+  <delegate decode="hpg" command='"hp2xx" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
+  <delegate decode="hpgl" command='"hp2xx" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
+  <!-- Read HTML file  -->
+  <delegate decode="htm" command='"html2ps" -U -o "%o" "%i"' />
+  <!-- Read HTML file  -->
+  <delegate decode="html" command='"html2ps" -U -o "%o" "%i"' />
+  <delegate decode="ilbm" command='"ilbmtoppm" "%i" > "%o"' />
+  <!-- Read UNIX manual page  -->
+  <delegate decode="man" command='"groff" -man -Tps "%i" > "%o"' />
+  <!-- Read MPEG file using mpeg2decode  -->
+  <delegate decode="mpeg" command='"mpeg2decode" -q -b "%i" -f -o3 "%u%%05d"; gm convert -temporary "%u*.ppm" "miff:%o" ; rm -f "%u"*.ppm ' />
+  <!-- Write MPEG file using mpeg2encode -->
+  <delegate encode="mpeg-encode" stealth="True" command='"mpeg2encode" "%i" "%o"' />
+  <!-- Convert PDF to Encapsulated Poscript using Ghostscript -->
+  <delegate decode="pdf" encode="eps" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=epswrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <!-- Convert PDF to Postcript using Ghostscript -->
+  <delegate decode="pdf" encode="ps" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pswrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <!-- Convert PNM file to ILBM format using ppmtoilbm -->
+  <delegate decode="pnm" encode="ilbm" mode="encode" command='"ppmtoilbm" -24if "%i" > "%o"' />
+  <delegate decode="pnm" encode="launch" mode="encode" command='"gimp" "%i"' />
+  <delegate decode="pnm" encode="win" mode="encode" command='"gm" display -immutable "%i"' />
+  <!-- Read Persistance Of Vision file using povray  -->
+  <delegate decode="pov" command='povray "+i"%i"" +o"%o" +fn%q +w%w +h%h +a -q9 -kfi"%s" -kff"%n"
+    "gm" convert -adjoin "%o*.png" "%o"' />
+  <delegate decode="ps" encode="eps" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=epswrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <delegate decode="ps" encode="pdf" mode="bi" command='"gs" -q -dBATCH -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=pdfwrite "-sOutputFile=%o" -- "%i" -c quit' />
+  <delegate decode="ps" encode="print" mode="encode" command='"/usr/bin/lpr" "%i"' />
+  <!-- Read Radiance file using ra_ppm -->
+  <delegate decode="rad" command='"ra_ppm" -g 1.0 "%i" "%o"' />
+  <!-- Convert RGBA file to URT RLE using rawtorle -->
+  <delegate decode="rgba" encode="rle" mode="encode" command='"gm" mogrify -flip -size %wx%h "rgba:%i"
+    "rawtorle" -w %w -h %h -n 4 -o "%o" "%i"' />
+   <!-- Scan an image using Sane's scanimage -->
+  <delegate decode="scan" command='"scanimage" -d "%i" > "%o"' />
+  <!-- Read HTML file  -->
+  <delegate decode="shtml" command='"html2ps" -U -o "%o" "%i"' />
+  <!-- Convert ASCII text to Postscript using 'enscript' command -->
+  <delegate decode="txt" encode="ps" mode="bi" command='"enscript" -o "%o" "%i"' />
+  <!-- Render WMF file using wmf2eps (fallback in case libwmf not available) -->
+  <delegate decode="wmf" command='"wmf2eps" -o "%o" "%i"' />
+  <delegate encode="show" stealth="True" command='"gm" display -immutable -delay 0 -window_group %g -title "%l of %f" "tmp:%o" &' />
+</delegatemap>
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/magic.mgk
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/magic.mgk (revision 641)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/lib/GraphicsMagick-1.3.5/config/magic.mgk (revision 641)
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<magicmap>
+  <magic name="AVI" offset="0" target="RIFF" />
+  <magic name="8BIMWTEXT" offset="0" target="8\000B\000I\000M\000#" />
+  <magic name="8BIMTEXT" offset="0" target="8BIM#" />
+  <magic name="8BIM" offset="0" target="8BIM" />
+  <magic name="BMP" offset="0" target="BA" />
+  <magic name="BMP" offset="0" target="BM" />
+  <magic name="BMP" offset="0" target="CI" />
+  <magic name="BMP" offset="0" target="CP" />
+  <magic name="BMP" offset="0" target="IC" />
+  <magic name="BMP" offset="0" target="PI" />
+  <magic name="CGM" offset="0" target="BEGMF" />
+  <magic name="CIN" offset="0" target="\200\052\137\327" />
+  <magic name="DCM" offset="128" target="DICM" />
+  <magic name="DCX" offset="0" target="\261\150\336\72" />
+  <magic name="DIB" offset="0" target="\050\000" />
+  <magic name="DOT" offset="0" target="digraph" />
+  <magic name="DPX" offset="0" target="SDPX" />
+  <magic name="DPX" offset="0" target="XPDS" />
+  <magic name="EMF" offset="40" target="\040\105\115\106\000\000\001\000" />
+  <magic name="EPT" offset="0" target="\305\320\323\306" />
+  <magic name="FAX" offset="0" target="DFAX" />
+  <magic name="FIG" offset="0" target="#FIG" />
+  <magic name="FITS" offset="0" target="IT0" />
+  <magic name="FITS" offset="0" target="SIMPLE" />
+  <magic name="FPX" offset="0" target="\320\317\021\340" />
+  <magic name="GIF" offset="0" target="GIF8" />
+  <magic name="GPLT" offset="0" target="#!/usr/local/bin/gnuplot" />
+  <magic name="HDF" offset="1" target="HDF" />
+  <magic name="HPGL" offset="0" target="IN;" />
+  <magic name="HPGL" offset="0" target="\033E\033" />
+  <magic name="HTML" offset="1" target="HTML" />
+  <magic name="HTML" offset="1" target="html" />
+  <magic name="ILBM" offset="8" target="ILBM" />
+  <magic name="IPTCWTEXT" offset="0" target="\062\000#\000\060\000=\000\042\000&\000#\000\060\000;\000&\000#\000\062\000;\000\042\000" />
+  <magic name="IPTCTEXT" offset="0" target="2#0=\042&#0;&#2;\042" />
+  <magic name="IPTC" offset="0" target="\034\002" />
+  <magic name="JNG" offset="0" target="\213JNG\r\n\032\n" />
+  <magic name="JPEG" offset="0" target="\377\330\377" />
+  <magic name="JPC" offset="0" target="\377\117" />
+  <magic name="JP2" offset="4" target="\152\120\040\040\015" />
+  <magic name="MIFF" offset="0" target="Id=ImageMagick" />
+  <magic name="MIFF" offset="0" target="id=ImageMagick" />
+  <magic name="MNG" offset="0" target="\212MNG\r\n\032\n" />
+  <magic name="MPC" offset="0" target="id=MagickCache" />
+  <magic name="MPEG" offset="0" target="\000\000\001\263" />
+  <magic name="PCD" offset="2048" target="PCD_" />
+  <magic name="PCL" offset="0" target="\033E\033" />
+  <magic name="PCX" offset="0" target="\012\002" />
+  <magic name="PCX" offset="0" target="\012\005" />
+  <magic name="PDB" offset="60" target="vIMGView" />
+  <magic name="PDF" offset="0" target="%PDF-" />
+  <magic name="PFA" offset="0" target="%!PS-AdobeFont-1.0" />
+  <magic name="PFB" offset="6" target="%!PS-AdobeFont-1.0" />
+  <magic name="PGX" offset="0" target="\050\107\020\115\046" />
+  <magic name="PICT" offset="522" target="\000\021\002\377\014\000" />
+  <magic name="PNG" offset="0" target="\211PNG\r\n\032\n" />
+  <magic name="PNM" offset="0" target="P1" />
+  <magic name="PNM" offset="0" target="P2" />
+  <magic name="PNM" offset="0" target="P3" />
+  <magic name="PNM" offset="0" target="P4" />
+  <magic name="PNM" offset="0" target="P5" />
+  <magic name="PNM" offset="0" target="P6" />
+  <magic name="PNM" offset="0" target="P7" />
+  <magic name="PS" offset="0" target="%!" />
+  <magic name="PS" offset="0" target="\004%!" />
+  <magic name="PS" offset="0" target="\305\320\323\306" />
+  <magic name="PSD" offset="0" target="8BPS" />
+  <magic name="PWP" offset="0" target="SFW95" />
+  <magic name="RAD" offset="0" target="#?RADIANCE" />
+  <magic name="RAD" offset="0" target="VIEW= " />
+  <magic name="RLE" offset="0" target="\122\314" />
+  <magic name="SCT" offset="0" target="CT" />
+  <magic name="SFW" offset="0" target="SFW94" />
+  <magic name="SGI" offset="0" target="\001\332" />
+  <magic name="SUN" offset="0" target="\131\246\152\225" />
+  <magic name="SVG" offset="1" target="?XML" />
+  <magic name="SVG" offset="1" target="?xml" />
+  <magic name="TIFF" offset="0" target="\115\115\000\052" />
+  <magic name="TIFF" offset="0" target="\111\111\052\000" />
+  <magic name="BIGTIFF" offset="0" target="\115\115\000\053\000\010\000\000" />
+  <magic name="BIGTIFF" offset="0" target="\111\111\053\000\010\000\000\000" />
+  <magic name="VICAR" offset="0" target="LBLSIZE" />
+  <magic name="VICAR" offset="0" target="NJPL1I" />
+  <magic name="VIFF" offset="0" target="\253\001" />
+  <magic name="WMF" offset="0" target="\327\315\306\232" />
+  <magic name="WMF" offset="0" target="\001\000\011\000" />
+  <magic name="WPG" offset="0" target="\377WPC" />
+  <magic name="XBM" offset="0" target="#define" />
+  <magic name="XCF" offset="0" target="gimp xcf" />
+  <magic name="XPM" offset="1" target="* XPM *" />
+  <magic name="XWD" offset="4" target="\007\000\000" />
+  <magic name="XWD" offset="5" target="\000\000\007" />
+</magicmap>
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/application.ini
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/application.ini (revision 640)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/application.ini (revision 641)
@@ -13,5 +13,5 @@
 Name=Flickr Uploadr
 Version=3.2.2
-BuildID=2009062501
+BuildID=2009062901
 Copyright=Copyright (c) 2007-2009 - Yahoo!, Inc.
 ID=uploadr@flickr.com
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/Makefile
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/Makefile (revision 636)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/Makefile (revision 641)
@@ -21,5 +21,5 @@
 X11_LIB := -L/usr/X11R6/lib
 PORTS_LIB := -L/opt/local/lib
-XULRUNNER := ../../Frameworks/XUL.framework/Versions/Current
+XULRUNNER := ../../Frameworks/XUL.framework
 
 ifeq (mac, $(PLATFORM))
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/clh.js
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/clh.js (revision 501)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/components/clh.js (revision 641)
@@ -45,4 +45,7 @@
 		for (var i = start; i < ii; ++i) {
 			var arg = cl.getArgument(i);
+			Cc["@mozilla.org/consoleservice;1"]
+				.getService(Ci.nsIConsoleService)
+				.logStringMessage(new Date().toUTCString() + ': ' + arg);
 			if ('-' == arg.substr(0,1)) continue;
 
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/clh.js
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/clh.js (revision 640)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/clh.js (revision 641)
@@ -37,9 +37,11 @@
 	}
 	if( queue && (0 == queue.indexOf("flickrup")) ) {
-	    if( (0 == queue.indexOf("flickrup://auth/?&frob=")) || // on Windows, there is this /
-	        (0 == queue.indexOf("flickrup://auth?&frob="))) { // on Mac not. Go figure.
+	    if(0 == queue.indexOf("flickrup://auth/?&frob=")) {// on Windows, there is this /
 	        users.frob = queue.substr(23);
 	        return true;
-	    }
+	    } else if(0 == queue.indexOf("flickrup://auth?&frob=")) { // on Mac not. Go figure.
+			users.frob = queue.substr(22);
+	        return true;
+		}
 	    else { //something is fishy
 	        alert("!?");
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/dock.xul
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/dock.xul (revision 501)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/dock.xul (revision 641)
@@ -14,4 +14,5 @@
 id="dock" title="" width="0" height="0">
 	<script src="chrome://global/content/nsUserSettings.js" />
+	<script src="chrome://uploadr/content/clh.js" />
 	<script><![CDATA[
 	window.addEventListener('load', function() {
@@ -37,6 +38,11 @@
 			var arg = window.arguments[0];
 			if (win) {
-				win.threads.worker.dispatch(new win.PhotoAdd(arg),
-					win.threads.worker.DISPATCH_NORMAL);
+				if( arg && (0 == arg.indexOf("flickrup")) ) { // frob command line
+					win.clh(true, arg);
+				}
+				else {
+					win.threads.worker.dispatch(new win.PhotoAdd(arg),
+						win.threads.worker.DISPATCH_NORMAL);
+				}
 				window.close();
 				win.focus();
Index: /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/threads.js
===================================================================
--- /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/threads.js (revision 639)
+++ /branches/uploadr/3.2/MacUploadr.app/Contents/Resources/chrome/content/uploadr/threads.js (revision 641)
@@ -680,4 +680,5 @@
 PhotoAddCallback.prototype = {
 	run: function() {
+		logStringMessage("photos.add from PhotoAdd "+ this.path);
 		photos.add([this.path]);
 	},
Index: /branches/uploadr/3.2/Makefile
===================================================================
--- /branches/uploadr/3.2/Makefile (revision 636)
+++ /branches/uploadr/3.2/Makefile (revision 641)
@@ -98,5 +98,5 @@
 
 # GraphicsMagick version for stupid directory structure
-GM_VER := 1.2.5
+GM_VER := 1.3.5
 
 # Location of Mozilla tree for the MAR tools