Sat, 18 Jun 2011 01:37:03 +0200This part is done, the branch can be closed eventloop_libdispatch
Thijs Alkemade <thijsalkemade@gmail.com> [Sat, 18 Jun 2011 01:37:03 +0200] rev 3935
This part is done, the branch can be closed

Thu, 24 Feb 2011 00:01:19 +0100Timer still wasn't quite right, it should fire each interval until the function returns FALSE. eventloop_libdispatch
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 24 Feb 2011 00:01:19 +0100] rev 3934
Timer still wasn't quite right, it should fire each interval until the function returns FALSE.

Also, add adium_timeout_add_seconds() with larger leeway.

Wed, 23 Feb 2011 22:06:50 +0100Forgot to set a start time for the dispatch timer in adium_timeout_add(). eventloop_libdispatch
Thijs Alkemade <thijsalkemade@gmail.com> [Wed, 23 Feb 2011 22:06:50 +0100] rev 3933
Forgot to set a start time for the dispatch timer in adium_timeout_add().

Wed, 23 Feb 2011 21:35:41 +0100Rewrote the libpurple eventloop to use libdispatch. Very experimental, and obviously 10.6 only. eventloop_libdispatch
Thijs Alkemade <thijsalkemade@gmail.com> [Wed, 23 Feb 2011 21:35:41 +0100] rev 3932
Rewrote the libpurple eventloop to use libdispatch. Very experimental, and obviously 10.6 only.

Thu, 16 Jun 2011 00:40:14 +0200Merged
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 16 Jun 2011 00:40:14 +0200] rev 3931
Merged

Thu, 16 Jun 2011 00:32:59 +0200This is actually how gtkblist.c does it. Do not attempt to add a buddy with purple_blist_add_buddy() when the buddy already existed.
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 16 Jun 2011 00:32:59 +0200] rev 3930
This is actually how gtkblist.c does it. Do not attempt to add a buddy with purple_blist_add_buddy() when the buddy already existed.

Refs #15260

Mon, 13 Jun 2011 22:19:26 +0200Amend the changelog now that 1.4.2 is released.
Robert Vehse [Mon, 13 Jun 2011 22:19:26 +0200] rev 3929
Amend the changelog now that 1.4.2 is released.

Also fix a glitch in the German localisation.

Sun, 12 Jun 2011 11:37:21 +0200Use the devId from the AIR version of ICQ instead of the old one we had for both AIM and ICQ, which has stopped working for ICQ for unknown reasons.
Thijs Alkemade <thijsalkemade@gmail.com> [Sun, 12 Jun 2011 11:37:21 +0200] rev 3928
Use the devId from the AIR version of ICQ instead of the old one we had for both AIM and ICQ, which has stopped working for ICQ for unknown reasons.
(transplanted from c1efbc00096f37c708c4623c94aaabc359c2b02f)

Fri, 10 Jun 2011 10:25:49 +0200Credit toszcze for his Polish translation in Credits.rtf. Refs #15230.
Robert Vehse [Fri, 10 Jun 2011 10:25:49 +0200] rev 3927
Credit toszcze for his Polish translation in Credits.rtf. Refs #15230.

Tue, 07 Jun 2011 19:04:16 +0200Nuke QQ everywhere in Adium too.
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 07 Jun 2011 19:04:16 +0200] rev 3926
Nuke QQ everywhere in Adium too.

Tue, 07 Jun 2011 12:55:48 +0200Merged
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 07 Jun 2011 12:55:48 +0200] rev 3925
Merged

Tue, 07 Jun 2011 12:55:08 +0200Accidentially removed these aliasses.
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 07 Jun 2011 12:55:08 +0200] rev 3924
Accidentially removed these aliasses.

Tue, 07 Jun 2011 12:52:38 +0200libpurple 2.8.0 [im.pidgin.adium @ 62dc4397d71bdd6ca7a90d0f5393d2bc9ebc8fd8]
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 07 Jun 2011 12:52:38 +0200] rev 3923
libpurple 2.8.0 [im.pidgin.adium @ 62dc4397d71bdd6ca7a90d0f5393d2bc9ebc8fd8]

Should build, but might have problems with QQ and Facebook account types, as those prpls were removed.

Sun, 05 Jun 2011 19:57:48 +0200iTunes status format can now be customized via new token field.
Patrick Steinhardt <steinhardt.p@me.com> [Sun, 05 Jun 2011 19:57:48 +0200] rev 3922
iTunes status format can now be customized via new token field.

Fri, 03 Jun 2011 17:29:18 +0200Revalidate (and thus determine if "http://" should be prepended) when calling -[SHAutoValidatingTextView setContinuousURLValidationEnabled:TRUE] so it will also revalidate when auto-pasting.
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 03 Jun 2011 17:29:18 +0200] rev 3921
Revalidate (and thus determine if "http://" should be prepended) when calling -[SHAutoValidatingTextView setContinuousURLValidationEnabled:TRUE] so it will also revalidate when auto-pasting.

Fixes #15229

Fri, 03 Jun 2011 17:26:55 +0200Fix the automatic pasting of URLs from the pasteboard when using Edit -> Add Link...
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 03 Jun 2011 17:26:55 +0200] rev 3920
Fix the automatic pasting of URLs from the pasteboard when using Edit -> Add Link...

Refs #15229

Fri, 03 Jun 2011 16:35:19 +0200As indicated by the comment, this can be removed now that 1.4 is out.
Thijs Alkemade <thijsalkemade@gmail.com> [Fri, 03 Jun 2011 16:35:19 +0200] rev 3919
As indicated by the comment, this can be removed now that 1.4 is out.

Tue, 31 May 2011 01:26:12 +0200Replaced old "Format names as:" with instructions and broadened token field.
Patrick Steinhardt <steinhardt.p@me.com> [Tue, 31 May 2011 01:26:12 +0200] rev 3918
Replaced old "Format names as:" with instructions and broadened token field.

Thu, 26 May 2011 12:48:45 +0200Renamed "Use First if Nick not available" and replaced "Use Nick if First not available" with "Use Nick exclusively if available".
Patrick Steinhardt <steinhardt.p@me.com> [Thu, 26 May 2011 12:48:45 +0200] rev 3917
Renamed "Use First if Nick not available" and replaced "Use Nick if First not available" with "Use Nick exclusively if available".

r=xnyhps

Thu, 26 May 2011 12:29:15 +0200Patch from "Camillo" which removes the no longer necessary workaround when verifying the identify of Google Talk servers.
Thijs Alkemade <thijsalkemade@gmail.com> [Thu, 26 May 2011 12:29:15 +0200] rev 3916
Patch from "Camillo" which removes the no longer necessary workaround when verifying the identify of Google Talk servers.

Fixes #14891

Wed, 25 May 2011 09:18:05 +0200Updated Growl.framework to 1.2.2. Updated Growl's icon.
Thijs Alkemade <thijsalkemade@gmail.com> [Wed, 25 May 2011 09:18:05 +0200] rev 3915
Updated Growl.framework to 1.2.2. Updated Growl's icon.

Tue, 24 May 2011 18:41:58 +0200It seems I messed something up when committing this nib. Also, make sure the name is actually longer than @"" when using initials.
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 24 May 2011 18:41:58 +0200] rev 3914
It seems I messed something up when committing this nib. Also, make sure the name is actually longer than @"" when using initials.

Tue, 24 May 2011 18:13:18 +0200Based on a patch from "zee", allow tab bar scrubbing to be disabled with defaults
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 24 May 2011 18:13:18 +0200] rev 3913
Based on a patch from "zee", allow tab bar scrubbing to be disabled with defaults

Fixes #15073

Tue, 24 May 2011 18:08:01 +0200With this syntax, it will not compile in Xcode 3.
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 24 May 2011 18:08:01 +0200] rev 3912
With this syntax, it will not compile in Xcode 3.

Tue, 24 May 2011 17:56:22 +0200Changelog the previous patch. Refs #7394
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 24 May 2011 17:56:22 +0200] rev 3911
Changelog the previous patch. Refs #7394

Tue, 24 May 2011 17:40:19 +0200"Format names as:" is now a token field. Fixes #3116, fixes #15184, fixes #7394.
Patrick Steinhardt <steinhardt.p@me.com> [Tue, 24 May 2011 17:40:19 +0200] rev 3910
"Format names as:" is now a token field. Fixes #3116, fixes #15184, fixes #7394.

r=xnyhps

Tue, 24 May 2011 15:50:49 +0200Changelog and credit Peter Fung for his patches. Refs #15183, refs #15186.
Robert Vehse [Tue, 24 May 2011 15:50:49 +0200] rev 3909
Changelog and credit Peter Fung for his patches. Refs #15183, refs #15186.

Mon, 16 May 2011 23:11:28 +0800Fixed a bug when writing inline images to chat logs
Peter Fung <appfung@gmail.com> [Mon, 16 May 2011 23:11:28 +0800] rev 3908
Fixed a bug when writing inline images to chat logs

Fixes #15186, r=xnyhps

Mon, 16 May 2011 23:07:37 +0800Group chat should support purple images (custom emoticons etc.)
Peter Fung <appfung@gmail.com> [Mon, 16 May 2011 23:07:37 +0800] rev 3907
Group chat should support purple images (custom emoticons etc.)

Fixes #15183, r=xnyhps

Sat, 21 May 2011 14:33:52 +0200Actually set RELEASE_BUILD for Release and Debug-Release.
Thijs Alkemade <thijsalkemade@gmail.com> [Sat, 21 May 2011 14:33:52 +0200] rev 3906
Actually set RELEASE_BUILD for Release and Debug-Release.

Transplanted from http://hg.adium.im/adium-1.4/rev/9b3686f7a1c9.

Sat, 21 May 2011 14:06:48 +0200Merged
Thijs Alkemade <thijsalkemade@gmail.com> [Sat, 21 May 2011 14:06:48 +0200] rev 3905
Merged

Sat, 21 May 2011 14:04:32 +0200When running a Release-Debug build, store the profile used correctly as the normal profile instead of the debug profile.
Thijs Alkemade <thijsalkemade@gmail.com> [Sat, 21 May 2011 14:04:32 +0200] rev 3904
When running a Release-Debug build, store the profile used correctly as the normal profile instead of the debug profile.

Refs #14432
(transplanted from 355bff287503b09fdd125cc119991fce8c9973c9)

Fri, 20 May 2011 01:21:20 +0300Remove unnecessary stuff from AIContactListUserPictureMenuController.
Adrian Godoroja <robotive@me.com> [Fri, 20 May 2011 01:21:20 +0300] rev 3903
Remove unnecessary stuff from AIContactListUserPictureMenuController.
Minor event handling related additions to AIImageCollectionView.

Thu, 19 May 2011 02:17:03 +0200(Refs 15163#) Bunch of small changes:
Robert Vehse [Thu, 19 May 2011 02:17:03 +0200] rev 3902
(Refs 15163#) Bunch of small changes:

* Credit Patrick Steinhardt ("pKs") for his recent patches.
* One typo each in the German localisation and in a comment.
* Fix a glitch in the German localisation.

Wed, 18 May 2011 21:33:51 +0300AILeopardCompatibility removal. Patch by Patrick Steinhardt.
Adrian Godoroja <robotive@me.com> [Wed, 18 May 2011 21:33:51 +0300] rev 3901
AILeopardCompatibility removal. Patch by Patrick Steinhardt.

Tue, 17 May 2011 00:00:31 +0200Fix a crash that occurs when opening irc://-links to new servers on ports other than 6667.
Thijs Alkemade <thijsalkemade@gmail.com> [Tue, 17 May 2011 00:00:31 +0200] rev 3900
Fix a crash that occurs when opening irc://-links to new servers on ports other than 6667.

Fixes #15093

Wed, 04 May 2011 10:23:27 +0200Fixed broken percentage reflecting connection progress in Accounts.
Patrick Steinhardt <steinhardt.p@me.com> [Wed, 04 May 2011 10:23:27 +0200] rev 3899
Fixed broken percentage reflecting connection progress in Accounts.

r=xnyhps. Fixes #15163

Sun, 08 May 2011 22:21:51 +0200Make the "Information About Importing" button in the Setup Wizard localizable. Fixes #15139
Thijs Alkemade <thijsalkemade@gmail.com> [Sun, 08 May 2011 22:21:51 +0200] rev 3898
Make the "Information About Importing" button in the Setup Wizard localizable. Fixes #15139
(transplanted from a0e70ba938f561ed1c074c852e31497f1413753e)

Fri, 06 May 2011 11:27:50 +0200Oops
Robert Vehse [Fri, 06 May 2011 11:27:50 +0200] rev 3897
Oops

Fri, 06 May 2011 11:24:43 +0200Changelog #15158. Refs #15158.
Robert Vehse [Fri, 06 May 2011 11:24:43 +0200] rev 3896
Changelog #15158. Refs #15158.

Fri, 06 May 2011 03:03:40 +0300Tooltips tracking, better way of tracking mouse scrolling. Refs #3480
Adrian Godoroja <robotive@me.com> [Fri, 06 May 2011 03:03:40 +0300] rev 3895
Tooltips tracking, better way of tracking mouse scrolling. Refs #3480

Fri, 06 May 2011 01:58:10 +0300AIImageCollectionView will update the highlight when scrolling.
Adrian Godoroja <robotive@me.com> [Fri, 06 May 2011 01:58:10 +0300] rev 3894
AIImageCollectionView will update the highlight when scrolling.

Wed, 04 May 2011 01:59:02 +0200Use "ChatCreationInfo" here instead of "chatCreationInfo", to remain compatible with 1.4 if "Reopen chats from last time" is enabled.
Thijs Alkemade <thijsalkemade@gmail.com> [Wed, 04 May 2011 01:59:02 +0200] rev 3893
Use "ChatCreationInfo" here instead of "chatCreationInfo", to remain compatible with 1.4 if "Reopen chats from last time" is enabled.

This will mean everybody on 1.5hg will not automatically rejoin on startup once after upgrading. Sorry.

Fixes #15019

Tue, 03 May 2011 14:56:48 -0500Smooth Operator: Don't try to display user icons in the header for IRC buddy chat.
mathuaerknedam [Tue, 03 May 2011 14:56:48 -0500] rev 3892
Smooth Operator: Don't try to display user icons in the header for IRC buddy chat.
(transplanted from 173f91e7d66c982e56707b64a8f189330fb8dd3e)

Tue, 03 May 2011 12:42:07 -0500Enable the %service% keyword in the header.
mathuaerknedam [Tue, 03 May 2011 12:42:07 -0500] rev 3891
Enable the %service% keyword in the header.

Tue, 03 May 2011 17:48:18 +0200Update German localisation. Adopt some changes mwulftange made for 1.4.2hg.
Robert Vehse [Tue, 03 May 2011 17:48:18 +0200] rev 3890
Update German localisation. Adopt some changes mwulftange made for 1.4.2hg.

Tue, 03 May 2011 16:41:23 +0300Update tooltips when "scrollwheeling" through the contact list. Fixes #3480
Adrian Godoroja <robotive@me.com> [Tue, 03 May 2011 16:41:23 +0300] rev 3889
Update tooltips when "scrollwheeling" through the contact list. Fixes #3480

Sat, 30 Apr 2011 17:23:31 -0400Fix the user list not updating its users. Also fixes #15142.
Frank Dowsett <wixardy@adium.im> [Sat, 30 Apr 2011 17:23:31 -0400] rev 3888
Fix the user list not updating its users. Also fixes #15142.

Fri, 29 Apr 2011 16:30:06 +0300Make tooltip contents opaque, only background transparent. Fixes #15050
Adrian Godoroja <robotive@me.com> [Fri, 29 Apr 2011 16:30:06 +0300] rev 3887
Make tooltip contents opaque, only background transparent. Fixes #15050

Fri, 29 Apr 2011 01:45:26 +0200Remove Ukrainian.lproj files since we now use uk_UA.
Robert Vehse [Fri, 29 Apr 2011 01:45:26 +0200] rev 3886
Remove Ukrainian.lproj files since we now use uk_UA.

Fri, 29 Apr 2011 02:40:26 +0300Failed to remove with previous commit.
Adrian Godoroja <robotive@me.com> [Fri, 29 Apr 2011 02:40:26 +0300] rev 3885
Failed to remove with previous commit.

Fri, 29 Apr 2011 02:38:40 +0300Moved AIDockIconSelectionSheet to use AIImageCollectionView (Removed AIImageGridView).
Adrian Godoroja <robotive@me.com> [Fri, 29 Apr 2011 02:38:40 +0300] rev 3884
Moved AIDockIconSelectionSheet to use AIImageCollectionView (Removed AIImageGridView).
Also some fixes and improvements (Refs #15158 - Fix_ed for 1.5hg).
Lots of improvements/additions to AIImageCollectionView.
Moved AIImageCollectionView to AIUtilities Framework.

Thu, 28 Apr 2011 20:33:32 +0200Added a note about having to hold down the Command key when separating combined contacts in a borderless contact list.
Robert Vehse [Thu, 28 Apr 2011 20:33:32 +0200] rev 3883
Added a note about having to hold down the Command key when separating combined contacts in a borderless contact list.

Wed, 27 Apr 2011 15:22:56 -0400GeneralPreferences.nib no longer uses a custom Interface Builder plugin; the SRRecorderControl is instead instatiated at run time and swapped into the view heirarchy in place of a placeholder view. Fixes #15155
Evan Schoenberg [Wed, 27 Apr 2011 15:22:56 -0400] rev 3882
GeneralPreferences.nib no longer uses a custom Interface Builder plugin; the SRRecorderControl is instead instatiated at run time and swapped into the view heirarchy in place of a placeholder view. Fixes #15155

Fri, 22 Apr 2011 13:00:57 -0500Brazilian Portuguese update from Helv?cio Mafra
Evan Schoenberg [Fri, 22 Apr 2011 13:00:57 -0500] rev 3881
Brazilian Portuguese update from Helv?cio Mafra
(transplanted from 56c3a87b82bcc7c457db2311a08895ebc892cab0)

Sat, 23 Apr 2011 01:21:52 +0200Updated Catalan localisation from Svartkatt. Fixes #14898.
Robert Vehse [Sat, 23 Apr 2011 01:21:52 +0200] rev 3880
Updated Catalan localisation from Svartkatt. Fixes #14898.

Sat, 23 Apr 2011 00:51:54 +0200Added Svartkatt, the Catalan translator, to Credits.rtf.
Robert Vehse [Sat, 23 Apr 2011 00:51:54 +0200] rev 3879
Added Svartkatt, the Catalan translator, to Credits.rtf.

Fri, 22 Apr 2011 17:11:48 +0200Some Copyright year corrections robotive suggested.
Robert Vehse [Fri, 22 Apr 2011 17:11:48 +0200] rev 3878
Some Copyright year corrections robotive suggested.

Thu, 21 Apr 2011 19:56:43 +0200Credit kasper and move his predecessor to the list of retired translators. Refs #15130.
Robert Vehse [Thu, 21 Apr 2011 19:56:43 +0200] rev 3877
Credit kasper and move his predecessor to the list of retired translators. Refs #15130.
(transplanted from 8fccc991a3437dca7b7c019219824b01395272ff)

Wed, 20 Apr 2011 11:39:35 +0200Not paying attention this morning.
Robert Vehse [Wed, 20 Apr 2011 11:39:35 +0200] rev 3876
Not paying attention this morning.

Wed, 20 Apr 2011 11:32:13 +0200Oops, forgot this in my last commit: add wildwobby, remove Catfish_Man.
Robert Vehse [Wed, 20 Apr 2011 11:32:13 +0200] rev 3875
Oops, forgot this in my last commit: add wildwobby, remove Catfish_Man.

Wed, 20 Apr 2011 11:29:55 +0200Addd robotive to the list of our developers. This was overdue.
Robert Vehse [Wed, 20 Apr 2011 11:29:55 +0200] rev 3874
Addd robotive to the list of our developers. This was overdue.

Tue, 19 Apr 2011 19:38:44 +0200Purge another occurrence of "adiumx.com".
Robert Vehse [Tue, 19 Apr 2011 19:38:44 +0200] rev 3873
Purge another occurrence of "adiumx.com".

Mon, 18 Apr 2011 14:25:15 -0500Changelogging...
mathuaerknedam [Mon, 18 Apr 2011 14:25:15 -0500] rev 3872
Changelogging...

Sun, 17 Apr 2011 20:07:39 -0500Lazily making a mass update to message styles, bringing 1.5 up to date with the xtras repo.
mathuaerknedam [Sun, 17 Apr 2011 20:07:39 -0500] rev 3871
Lazily making a mass update to message styles, bringing 1.5 up to date with the xtras repo.

Sun, 17 Apr 2011 14:03:31 +0200Migrate when initialising an account, don't wait until it connects.
Thijs Alkemade <thijsalkemade@gmail.com> [Sun, 17 Apr 2011 14:03:31 +0200] rev 3870
Migrate when initialising an account, don't wait until it connects.
(transplanted from b30921efd7f02e11dea3e8d0e71df849f02f0cde)

Sun, 17 Apr 2011 12:51:21 +0200Change ICQ and AIM encryption settings to no/opportunistic/required encryption.
Thijs Alkemade <thijsalkemade@gmail.com> [Sun, 17 Apr 2011 12:51:21 +0200] rev 3869
Change ICQ and AIM encryption settings to no/opportunistic/required encryption.

For ICQ, all accounts will be changed to opportunistic (as the SSL settings were wiped by 1.4.1).
For AIM, when SSL was on, encryption is now required. When SSL was off, encryption is now opportunistic.

Additionally, turn on clientLogin for AIM.

Fixes #15000

Fri, 15 Apr 2011 09:34:42 -0500Replace Stockholm with Sooth Operator as the default message style.
mathuaerknedam [Fri, 15 Apr 2011 09:34:42 -0500] rev 3868
Replace Stockholm with Sooth Operator as the default message style.

Fri, 15 Apr 2011 09:23:30 -0500Remove WEBKIT_DEFAULT_STYLE. We already define the default message style in 'webkit defaults.plist' and use KEY_WEBKIT_STYLE. We don't need to maintain the default style in two different places.
mathuaerknedam [Fri, 15 Apr 2011 09:23:30 -0500] rev 3867
Remove WEBKIT_DEFAULT_STYLE. We already define the default message style in 'webkit defaults.plist' and use KEY_WEBKIT_STYLE. We don't need to maintain the default style in two different places.

Thu, 14 Apr 2011 15:09:13 -0400Changelogging VO
Frank Dowsett <wixardy@adium.im> [Thu, 14 Apr 2011 15:09:13 -0400] rev 3866
Changelogging VO

Thu, 14 Apr 2011 15:07:51 -0400A start on fixing VO; first up: contact list. The role being set (row) is not what it should be (static text).
Frank Dowsett <wixardy@adium.im> [Thu, 14 Apr 2011 15:07:51 -0400] rev 3865
A start on fixing VO; first up: contact list. The role being set (row) is not what it should be (static text).

Fixes #12916 and #9004 Refs #15115

Wed, 13 Apr 2011 23:39:16 -0400Remove 10.5 and G5 compatibility code from AdiumSound silencing a deprecated warning.
Frank Dowsett <wixardy@adium.im> [Wed, 13 Apr 2011 23:39:16 -0400] rev 3864
Remove 10.5 and G5 compatibility code from AdiumSound silencing a deprecated warning.

Tue, 12 Apr 2011 18:46:34 -0400NSBoxes aren't click-through? Who knew?
Frank Dowsett <wixardy@adium.im> [Tue, 12 Apr 2011 18:46:34 -0400] rev 3863
NSBoxes aren't click-through? Who knew?

Wed, 13 Apr 2011 00:11:14 +0200Fix a minor typo in an NSLog string.
Robert Vehse [Wed, 13 Apr 2011 00:11:14 +0200] rev 3862
Fix a minor typo in an NSLog string.

Tue, 12 Apr 2011 17:20:25 -0400Merge default into FloatingMessageWindowTextField. FloatingMessageWindowTextField
Frank Dowsett <wixardy@adium.im> [Tue, 12 Apr 2011 17:20:25 -0400] rev 3861
Merge default into FloatingMessageWindowTextField.