Changeset 324

Show
Ignore:
Timestamp:
04/03/08 17:26:19 (2 years ago)
Author:
rcrowley
Message:

Updated version number and locked down the extension update stuff (blank right now, but ready for the future)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/MacUploadr.app/Contents/Info.plist

    r310 r324  
    7171        </array> 
    7272        <key>CFBundleGetInfoString</key> 
    73         <string>Flickr Uploadr 3.1a5, (c) Yahoo!, Inc.</string> 
     73        <string>Flickr Uploadr 3.1, (c) Yahoo!, Inc.</string> 
    7474        <key>CFBundleIdentifier</key> 
    7575        <string>com.flickr.uploadr</string> 
    …… 
    8181        <string>APPL</string> 
    8282        <key>CFBundleShortVersionString</key> 
    83         <string>3.1a5</string> 
     83        <string>3.1</string> 
    8484        <key>CFBundleSignature</key> 
    8585        <string>FLUP</string> 
    …… 
    9898        </array> 
    9999        <key>CFBundleVersion</key> 
    100         <string>3.1a5</string> 
     100        <string>3.1</string> 
    101101</dict> 
    102102</plist> 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/application.ini

    r310 r324  
    1212Vendor=Flickr 
    1313Name=Flickr Uploadr 
    14 Version=3.1a5 
    15 BuildID=2008032401 
     14Version=3.1 
     15BuildID=2008040301 
    1616Copyright=Copyright (c) 2007-2008 - Yahoo!, Inc. 
    1717ID=uploadr@flickr.com 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/conf.js

    r317 r324  
    2929 
    3030        // What version am I? 
    31         version: '3.1a5', 
     31        version: '3.1', 
    3232 
    3333        // What types of API events should be written to the console? 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/defaults/preferences/prefs.js

    r310 r324  
    2222pref('general.useragent.locale', 'en-US'); 
    2323 
    24 // Can't do this because XMLHttpRequest obeys it 
    25 //pref('network.protocol-handler.external.http', true); 
    26 //pref('network.protocol-handler.external.https', true); 
    27  
    2824// Allow nicely launching their browser 
    2925pref('network.protocol-handler.warn-external.http', false); 
    …… 
    4339pref('extensions.logging.enabled', false); 
    4440pref('general.skins.selectedSkin', 'uploadr'); 
    45  
    46 // Don't know what to put here, this is Firefox's version 
    47 //pref('extensions.update.url', 'https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%'); 
    48  
     41pref('extensions.update.url', 'https://secure.flickr.com/services/uploadr/extensions/?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%'); 
    4942pref('extensions.getMoreExtensionsURL', 'http://flickr.com/tools/uploadr/'); 
    5043pref('extensions.getMoreThemesURL', 'http://flickr.com/tools/uploadr/'); 

  • trunk/uploadr/Makefile

    r316 r324  
    5353 
    5454# Version number for Uploadr 
    55 VER := 3.1a5 
     55VER := 3.1 
    5656 
    5757# Source files 
    …… 
    6767 
    6868# Dated version for the NSIS installer 
    69 VER_DATE := 2008.03.28.01 
     69VER_DATE := 2008.04.03.01 
    7070 
    7171# Location of Mozilla tree for the MAR tools 
    …… 
    230230        cp $(SRC)/Resources/defaults/preferences/*.js \ 
    231231                $(RES)/defaults/preferences/ 
     232        sed 's/en-US/$(INTL)/g' $(SRC)/Resources/defaults/preferences/prefs.js > \ 
     233                $(RES)/defaults/preferences/prefs.js 
    232234 
    233235        @# XULRunner locale 
    …… 
    240242        cp ./xulrunner_locales/$(INTL).* $(RES)/xulrunner/chrome/ 
    241243endif 
    242         sed 's/en-US/$(INTL)/g' $(SRC)/Resources/defaults/preferences/prefs.js > \ 
    243                 $(RES)/defaults/preferences/prefs.js 
    244244 
    245245        @# Chrome