adium/adium

Merged with adium-1.5.1

2012-05-15, Thijs Alkemade
2f13c975a8eb
Parents a944b9e676d39481585f824e
Children 24a111d0ddb1
Merged with adium-1.5.1
12 files changed, 22 insertions(+), 7 deletions(-)
  • +15 -0
    ChangeLogs/Changes.txt
  • +0 -0
    Frameworks/libglib.framework/Versions/2.0.0/libglib
  • +0 -0
    Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
  • +0 -0
    Frameworks/libgobject.framework/Versions/2.0.0/libgobject
  • +0 -0
    Frameworks/libgthread.framework/Versions/2.0.0/libgthread
  • +0 -0
    Frameworks/libintl.framework/Versions/8/libintl
  • +0 -0
    Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
  • +0 -0
    Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
  • +0 -0
    Frameworks/libpurple.framework/Versions/0.10.5/libpurple
  • +3 -3
    Plists/Info.plist
  • +2 -2
    Plugins/Purple Service/CBPurpleOscarAccount.m
  • +2 -2
    Release/Makefile
    • --- a/ChangeLogs/Changes.txt Sun May 13 16:11:03 2012 -0400
    +++ b/ChangeLogs/Changes.txt Tue May 15 20:14:18 2012 +0200
    @@ -1,5 +1,20 @@
    Adium Version History
    -----------------------
    +Version 1.5.1
    + * Adium is now securely signed with an Apple Developer ID for OS X 10.8 / GateKeeper compatibility
    + * Updated to libpurple 2.10.4
    + * AIM/ICQ: Fixed communication with buddies containing periods and underscores
    + * MSN: Fixed messages to offline contacts.
    + * Fixed a number of security issues (see http://pidgin.im/news/security/), small memory leaks, miscellaneous bugs.
    + * Fixed status indicators in chat windows with only one chat. (#9620)
    + * Renamed "Send Notification" to "Request Attention". (#15789)
    + * Adjusted the layout of the profile selection window.
    + * Adjusted the minimum size of the message window to be 200px. (#15794)
    + * Increased the size of the focus indicators so that they can be better seen when using overlay scrollbars.
    + * Fixed the transcript viewer not saving the user list size.
    + * Made "View Release Notes" localizable. (#15914)
    + * Corrected some MSN emoticon shortcuts. (#15926)
    +
    Version 1.5 (3/15/2012)
    Major changes
    * Requires Mac OS X 10.6.8 or later.
    Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
    Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
    Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
    Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
    Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
    Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
    Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
    Binary file Frameworks/libpurple.framework/Versions/0.10.5/libpurple has changed
    --- a/Plists/Info.plist Sun May 13 16:11:03 2012 -0400
    +++ b/Plists/Info.plist Tue May 15 20:14:18 2012 +0200
    @@ -354,7 +354,7 @@
    <key>CFBundleExecutable</key>
    <string>Adium</string>
    <key>CFBundleGetInfoString</key>
    - <string>1.6hg, Copyright © 2001-2012 The Adium Team</string>
    + <string>1.5.1b1, Copyright © 2001-2012 The Adium Team</string>
    <key>CFBundleHelpBookFolder</key>
    <string>AdiumHelp</string>
    <key>CFBundleHelpBookName</key>
    @@ -370,7 +370,7 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
    - <string>1.6hg</string>
    + <string>1.5.1b1</string>
    <key>CFBundleSignature</key>
    <string>AdIM</string>
    <key>CFBundleURLTypes</key>
    @@ -469,7 +469,7 @@
    </dict>
    </array>
    <key>CFBundleVersion</key>
    - <string>1.6hg</string>
    + <string>1.5.1b1</string>
    <key>LSApplicationCategoryType</key>
    <string>public.app-category.social-networking</string>
    <key>LSFileQuarantineEnabled</key>
    --- a/Plugins/Purple Service/CBPurpleOscarAccount.m Sun May 13 16:11:03 2012 -0400
    +++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Tue May 15 20:14:18 2012 +0200
    @@ -117,9 +117,9 @@
    if ((purple_proxy_info_get_type(proxy_info) != PURPLE_PROXY_NONE) &&
    purple_proxy_info_get_host(proxy_info) && strlen(purple_proxy_info_get_host(proxy_info))) {
    /* Proxy servers and client login don't currently get along. This should be fixed in libpurple, but until then,
    - * just don't use it.
    + * just don't use it, unless the hidden preference is set.
    */
    - purple_account_set_bool(account, "use_clientlogin", FALSE);
    + purple_account_set_bool(account, "use_clientlogin", [[NSUserDefaults standardUserDefaults] boolForKey:@"AIUseClientLoginWithProxies"]);
    }
    [super continueConnectWithConfiguredProxy];
    --- a/Release/Makefile Sun May 13 16:11:03 2012 -0400
    +++ b/Release/Makefile Tue May 15 20:14:18 2012 +0200
    @@ -17,7 +17,7 @@
    # - make all
    ###########
    -VERSION=1.6hg
    +VERSION=1.5.1b1
    BUILD_IN_DEBUG_MODE?=FALSE
    BETA?=TRUE
    OFFICIAL_BUILD?=TRUE
    @@ -216,4 +216,4 @@
    cd $(BUILD_DIR) && tar zcf $(RELEASE_NAME).tgz Adium*/ && cd ..
    tarball:
    - hg archive -t tgz ($TARBALL_DIR).tgz
    \ No newline at end of file
    + hg archive -t tgz ($TARBALL_DIR).tgz