aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* empathy-call-window: display_error: align the main message on the rightGuillaume Desmottes2009-11-121-0/+1
* empathy-call-window: display_error: put the image and vbox in a hboxGuillaume Desmottes2009-11-121-5/+11
* empathy-call-window: display_error: wrap the translated error msg as wellGuillaume Desmottes2009-11-121-0/+1
* Make location labels selectablePierre-Luc Beaudoin2009-11-121-0/+3
* Add missing location field in orderingPierre-Luc Beaudoin2009-11-121-0/+6
* Order location fieldsFrederic Peters2009-11-121-7/+21
* Force an unset presence type to appear as offline in the presence chooser and...Jonny Lamb2009-11-122-0/+13
* empathy-tp-contact-factory: ensure that empathy_tp_contact_factory_get_from_h...Guillaume Desmottes2009-11-121-1/+18
* empathy_dispatch_operation_dispose: fix crash when disconnecting the ready si...Guillaume Desmottes2009-11-121-5/+3
* Updated Spanish translationJorge González2009-11-111-58/+71
* use new tpAccount apiFelix Kaser2009-11-101-5/+5
* added tooltips to buttonsFelix Kaser2009-11-101-0/+3
* ui change: added 3 buttons to infobarFelix Kaser2009-11-101-13/+97
* two line messageFelix Kaser2009-11-101-1/+1
* removed double codeFelix Kaser2009-11-101-6/+4
* make the infobar smallerFelix Kaser2009-11-101-1/+0
* use only one button in error-infobarFelix Kaser2009-11-101-20/+2
* use smaller account icons for error messageFelix Kaser2009-11-101-1/+1
* use one lined error notificationsFelix Kaser2009-11-101-2/+2
* use gtk_box_pack_startFelix Kaser2009-11-101-2/+2
* use account icon instead of warning signFelix Kaser2009-11-101-4/+5
* added set message type to infobarFelix Kaser2009-11-101-1/+1
* refactoringFelix Kaser2009-11-101-25/+21
* bumped gtk-dep version to 2.18.0Felix Kaser2009-11-101-1/+1
* changed variable nameFelix Kaser2009-11-101-17/+17
* removed trailing whitespacesFelix Kaser2009-11-101-1/+1
* Added GtkInfobar and Retry buttonFelix Kaser2009-11-101-101/+48
* empathy_accounts_dialog_show: check if priv->cms is not NULL before using itGuillaume Desmottes2009-11-101-1/+1
* set 'R' as accelerator for the preferences dialogGuillaume Desmottes2009-11-101-1/+1
* set 'C' as accelerator for the Contact menu as 'C' is already used by Convers...Guillaume Desmottes2009-11-101-1/+1
* accounts-dialog: set the ypad on the "Name" cellGuillaume Desmottes2009-11-101-1/+1
* Fix race where UI sensitivity was being set before the AM was readyDanielle Madeley2009-11-101-2/+2
* Warn if accessing connection status before AM is readyDanielle Madeley2009-11-101-0/+5
* Updated Latvian translation.Rudolfs Mazurs2009-11-101-1040/+1997
* empathy-tp-call: we are not sending or receiving video if the video stream do...Guillaume Desmottes2009-11-101-0/+6
* main-window: save the size of the window when destroyedGuillaume Desmottes2009-11-091-0/+4
* empathy-ft-manager: save the size of the window when disposingGuillaume Desmottes2009-11-091-1/+5
* chat-window: save the size of the window when disposingGuillaume Desmottes2009-11-091-0/+1
* TpContactFactory: wait that the connection is ready before using itGuillaume Desmottes2009-11-091-13/+35
* dispatcher_init_connection_if_needed: wait that the connection is ready befor...Guillaume Desmottes2009-11-091-11/+32
* Don't leak references to dup'ed objectsDanielle Madeley2009-11-091-0/+3
* Move the call to empathy_idle_get_state() to once the AM is readyDanielle Madeley2009-11-091-11/+17
* [EmpathyIdle] track whether the AccountManager is ready, warn if it is notDanielle Madeley2009-11-091-0/+16
* Shavian translationThomas Thurman2009-11-081-2/+2
* Shavian translationThomas Thurman2009-11-082-0/+2632
* Added Norwegian bokmål translation.Kjartan Maraas2009-11-071-326/+403
* Updated Spanish translationJorge González2009-11-071-7/+18
* Updated Italian translationMilo Casagrande2009-11-071-10/+0
* Updated Italian translationMilo Casagrande2009-11-071-4/+16
* Disable codecs not meant for general purpose conferencingSjoerd Simons2009-11-071-0/+10
* Updated Spanish translationJorge González2009-11-061-106/+123
* media_stream_error_to_txt: correct the error message if the error was an audi...Guillaume Desmottes2009-11-061-7/+15
* accounts-dialog: display the 'remove' icon only on the selected rowGuillaume Desmottes2009-11-061-2/+0
* accounts-dialog: set the 'ypad' of cells in the account treeview to 4Guillaume Desmottes2009-11-061-2/+0
* accounts-dialog: simplify the remove acount confirmation dialogGuillaume Desmottes2009-11-061-15/+0
* account-widget: Change the label of the Connect button to 'Login'.Guillaume Desmottes2009-11-061-14/+9
* rephrase the TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED messageGuillaume Desmottes2009-11-061-1/+2
* Updated Slovenian translationMatej Urbančič2009-11-061-186/+260
* nautilus-sendto: don't dup the account manager; it's not needed (closes bug #...Jonny Lamb2009-11-061-36/+0
* Fix --enable-nautilus-sendtoPascal Terjan2009-11-061-3/+3
* debug-window: format timestamp in a readable wayPascal Terjan2009-11-061-8/+59
* Better reorganization of chat_window_update (#600732)Ryan LaBelle2009-11-061-24/+76
* empathy-call-window: add a friendly message for TP_MEDIA_STREAM_ERROR_CONNECT...Guillaume Desmottes2009-11-061-0/+7
* Updated Crimean Tatar (Crimean Turkish) translationReşat SABIQ2009-11-061-14/+75
* Added Crimean Tatar (Crimean Turkish) translationReşat SABIQ2009-11-062-0/+2913
* use 'Technical Details' as title of the expanderGuillaume Desmottes2009-11-051-1/+1
* pass NULL to gtk_label_new when creating an empty labelGuillaume Desmottes2009-11-051-2/+2
* Display the error message in a expanderGuillaume Desmottes2009-11-051-5/+30
* use the error message if we don't have a nice descriptionGuillaume Desmottes2009-11-051-4/+10
* factor out empathy_call_window_stream_errorGuillaume Desmottes2009-11-051-13/+16
* fix typo in commentGuillaume Desmottes2009-11-051-1/+1
* call_handler_notify_tp_call_cb: return if call is NULLGuillaume Desmottes2009-11-051-1/+2
* empathy-call-window: fix phrasing of the codec negotation failed msg and mark...Guillaume Desmottes2009-11-051-1/+2
* empathy-call-window: display an error message when codec negotiation failed (...Guillaume Desmottes2009-11-051-0/+136
* empathy-call-window: add a VBox to display errorsGuillaume Desmottes2009-11-051-2/+11
* empathy_call_handler_request_cb: notify when the tp-call property is setGuillaume Desmottes2009-11-051-0/+1
* TpCall: add {audio,video}-stream-error signalsGuillaume Desmottes2009-11-051-0/+58
* ensure that the "Previous Conversations" menu entry stays sensitive if there ...Guillaume Desmottes2009-11-051-1/+5
* contact-menu: rename "View Previous Conversations" menu entry to "Previous Co...Guillaume Desmottes2009-11-051-1/+1
* Empathy should link on Farsight2Guillaume Desmottes2009-11-051-0/+1
* debug window shouldn't be transientGuillaume Desmottes2009-11-042-2/+2
* debug-window: debug level names shouldn't be translatedGuillaume Desmottes2009-11-041-6/+6
* empathy-chat-window: always display the title of the current tabGuillaume Desmottes2009-11-041-9/+1
* Updated Spanish translationJorge González2009-11-041-214/+282
* Fix an errorGabor Kelemen2009-11-041-231/+255
* empathy-dispatch-operation: ensure that the operation stays alive while tp_ch...Guillaume Desmottes2009-11-041-2/+12
* empathy-dispatch-operation: ensure that the operation stays alive while tp_co...Guillaume Desmottes2009-11-041-0/+12
* Print "Unknown command" when typing "/help unknown"Xavier Claessens2009-11-041-0/+3
* Make parsing of commend with no args work againXavier Claessens2009-11-041-2/+6
* Merge branch 'irc-command'Xavier Claessens2009-11-045-95/+424
|\
| * Optimisation: Remove of the duplicated check for the command prefix.Xavier Claessens2009-11-041-6/+2
| * Make clear that for(foo); does nothing.Xavier Claessens2009-11-041-1/+2
| * In case of unknown command, suggest /helpXavier Claessens2009-11-011-1/+2
| * Move /me and /say support from EmpathyMessage to EmpathyChat.Xavier Claessens2009-11-013-71/+69
| * Add support for /help command without arg, to list all available commands.Xavier Claessens2009-11-011-39/+47
| * Add support for /help command and fix review commentsXavier Claessens2009-11-011-91/+165
| * Refactor chat commands.Xavier Claessens2009-11-011-85/+127
| * Add support for /msg commandXavier Claessens2009-11-011-2/+74
| * Add support for /query commandXavier Claessens2009-11-011-0/+28
| * Add support for /join commandXavier Claessens2009-11-011-2/+30
| * Fix topic not always shown, and add /topic command support.Xavier Claessens2009-11-013-27/+108
* | get_default_display_name: use the real protocol name to check if it's IRC or notGuillaume Desmottes2009-11-031-4/+7
* | new-chatroom-dialog: swap the position of the 'Room' and 'Server' entries.Guillaume Desmottes2009-11-031-8/+8
* | empathy_account_widget_contains_pending_changes: return TRUE if we are creati...Guillaume Desmottes2009-11-031-0/+10
* | Allow accounts_dialog_has_pending_change to return a NULL TpAccountGuillaume Desmottes2009-11-031-13/+24
* | Merge branch 'fix-586098'Danielle Madeley2009-11-031-50/+251
|\ \
| * | empathy-chat.c: input history - Using GList pointer instead of gint index.Jerzy Mansarliński2009-11-011-83/+109
| * | Fix coding styleJerzy Mansarliński2009-10-301-36/+37
| * | Add terminal-like chat input history. Fixes bug #586098.Jerzy Mansarliński2009-10-301-37/+211
| |/
* | empathy-account-widget: update apply button when our state changesGuillaume Desmottes2009-11-031-0/+23
* | empathy-account-widget: replace the 'Connect' buton by a 'Save' one ...Guillaume Desmottes2009-11-031-2/+36
* | Use call-{start,stop} icons in the incoming call dialogGuillaume Desmottes2009-11-031-2/+2
* | remove check.makGuillaume Desmottes2009-11-031-120/+0
* | No need to check for the 'check' framework any moreGuillaume Desmottes2009-11-032-29/+1
* | rename check-irc-helper to test-irc-helperGuillaume Desmottes2009-11-036-7/+7
* | merge check-empathy-helpers to test-helperGuillaume Desmottes2009-11-037-205/+188
* | remove check-*Guillaume Desmottes2009-11-038-189/+1
* | port check-empathy-chatroom-manager.c to GTestGuillaume Desmottes2009-11-035-22/+31
* | port check-empathy-chatroom.c to GTestGuillaume Desmottes2009-11-035-16/+24
* | port check-empathy-irc-network-manager.c to GTestGuillaume Desmottes2009-11-036-103/+120
* | port check-empathy-irc-network.c to GTestGuillaume Desmottes2009-11-035-40/+50
* | port check-empathy-irc-server.c to GTestGuillaume Desmottes2009-11-036-40/+48
* | move test_init/test_deinit to test-helper.cGuillaume Desmottes2009-11-034-17/+31
* | port check-empathy-utils.c to GTestGuillaume Desmottes2009-11-036-34/+72
* | Autocomplete for offline contacts. Closes bug #583919.Justin Forest2009-11-031-17/+15
* | account-chooser: allow for a non-prepared account manager (fixes bug #600537)Jonny Lamb2009-11-031-0/+8
* | accounts-dialog: don't always select the first account automaticallyJonny Lamb2009-11-031-2/+7
* | Remove LIBPANELAPPLET entry from configure.acDanielle Madeley2009-11-031-1/+0
* | empathy-accounts-dialog: account-validity-changed signal now has a 'valid' ar...Guillaume Desmottes2009-11-031-0/+1
* | Merge branch 'accountz'Jonny Lamb2009-11-0261-3462/+1308
|\ \
| * | Upped dependency on tp-glibJonny Lamb2009-10-301-1/+1
| * | contact-list-view: added note about waiting for manager to be come ready bugJonny Lamb2009-10-301-1/+1
| * | empathy: when creating salut account, be sure to wait for the account managerJonny Lamb2009-10-301-14/+37
| * | log-store-empathy: refer to "make logs async" bugJonny Lamb2009-10-301-1/+1
| * | dispatcher: refer to EmpathyHandler bugJonny Lamb2009-10-301-1/+1
| * | idle: added a comment to explain _is_just_connectedJonny Lamb2009-10-301-0/+3
| * | idle: don't hardcode 10 seconds as the "just connected" timeJonny Lamb2009-10-301-1/+5
| * | idle: add comment about the connect_times hash table typesJonny Lamb2009-10-301-0/+2
| * | idle: updated commentJonny Lamb2009-10-301-2/+4
| * | utils: remove FIXMEJonny Lamb2009-10-301-2/+0
| * | location-manager: keep a ref to self during preparation to make sure we stay ...Jonny Lamb2009-10-301-1/+2
| * | all: log error messages if preparing the account manager failsJonny Lamb2009-10-3015-30/+112
| * | check-empathy-chatroom-manager: port to new tp-glib account APIJonny Lamb2009-10-251-1/+1
| * | tests: port to new tp-glib account APIJonny Lamb2009-10-252-4/+5
| * | po: removed empathy-account.c from POTFILES.inJonny Lamb2009-10-251-1/+0
| * | contact-manager, dispatcher: renamed _new_connection_cb to _status_changed_cbJonny Lamb2009-10-252-6/+6
| * | idle: use the TpAccount pointer as key to the hash table, and remove values o...Jonny Lamb2009-10-251-12/+8
| * | empathy: port to new tp-glib account APIJonny Lamb2009-10-241-85/+76
| * | status-icon: port to new tp-glib account APIJonny Lamb2009-10-241-21/+36
| * | new-chatroom-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * | main-window: port to new tp-glib account APIJonny Lamb2009-10-241-48/+87
| * | import-widget: port to new tp-glib account APIJonny Lamb2009-10-241-27/+30
| * | import-mc4-accounts: port to new tp-glib account APIJonny Lamb2009-10-241-5/+5
| * | event-manager: port to new tp-glib account APIJonny Lamb2009-10-241-4/+11
| * | chatrooms-window: port to new tp-glib account APIJonny Lamb2009-10-241-2/+2
| * | chat-window: port to new tp-glib account APIJonny Lamb2009-10-242-14/+18
| * | accounts-dialog: port to new tp-glib account APIJonny Lamb2009-10-242-145/+70
| * | account-assistant: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * | ui-utils: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * | theme-adium: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * | presence-chooser: port to new tp-glib account APIJonny Lamb2009-10-241-14/+42
| * | new-message-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * | log-window: port to new tp-glib account APIJonny Lamb2009-10-242-30/+50
| * | location-manager: port to new tp-glib account APIJonny Lamb2009-10-241-16/+77
| * | irc-network-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * | contact-widget: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * | contact-list-view: port to new tp-glib account APIJonny Lamb2009-10-241-8/+10
| * | contact-dialogs: port to new tp-glib account APIJonny Lamb2009-10-241-3/+4
| * | chat-text-view: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * | chat: port to new tp-glib account APIJonny Lamb2009-10-242-23/+44
| * | account-widget: port to new tp-glib account APIJonny Lamb2009-10-241-14/+14
| * | account-chooser: port to new tp-glib account APIJonny Lamb2009-10-242-79/+102
| * | tp-roomlist: port to new tp-glib account APIJonny Lamb2009-10-242-8/+6
| * | log-store: port to new tp-glib account APIJonny Lamb2009-10-242-19/+19
| * | log-store-empathy: port to new tp-glib account APIJonny Lamb2009-10-241-17/+19
| * | log-manager: port to new tp-glib account APIJonny Lamb2009-10-242-11/+11
| * | dispatcher: port to new tp-glib account APIJonny Lamb2009-10-241-27/+48
| * | contact: port to new tp-glib account APIJonny Lamb2009-10-242-17/+13
| * | contact-manager: port to new tp-glib account APIJonny Lamb2009-10-241-22/+46
| * | chatroom: port to new tp-glib account APIJonny Lamb2009-10-242-13/+14
| * | chatroom-manager: port to new tp-glib account APIJonny Lamb2009-10-242-41/+27
| * | account-settings: port to new tp-glib account APIJonny Lamb2009-10-242-77/+77
| * | Add empathy_idle_account_is_just_connected function.Jonny Lamb2009-10-242-0/+70
| * | idle: port to new tp-glib account APIJonny Lamb2009-10-241-20/+22
| * | Add empathy_account_manager_get_accounts_connected function.Jonny Lamb2009-10-242-0/+36
| * | Add empathy_get_account_for_connection function.Jonny Lamb2009-10-242-1/+36
| * | Add empathy_idle_get_requested_presence function.Jonny Lamb2009-10-242-12/+44
| * | Removed EmpathyAccount{,Manager}.Jonny Lamb2009-10-235-2604/+0
* | | Updated Italian translation of the helpMilo Casagrande2009-11-022-1011/+3938
| |/ |/|
* | Fixes cycling tab bug in chat window (#589263)Rômulo Fernandes Machado2009-10-301-12/+49
* | empathy-accounts-dialog: do_constructor: always return a new referenceGuillaume Desmottes2009-10-291-3/+7
* | empathy-accounts-dialog: do_constructor: don't ref the dialog if it already e...Guillaume Desmottes2009-10-291-1/+3
* | Escape the header of the notification (#599431)Guillaume Desmottes2009-10-291-2/+7
* | move test app needing user interaction to interactive/Guillaume Desmottes2009-10-2911-32/+45
* | Add new smileys available in the last Icon Naming Spec (#593327)Rodolphe2009-10-271-5/+11
* | Merge branch 'mc5-debug'Danielle Madeley2009-10-271-0/+7
|\ \
| * | Add MissionControl to the debug windowDanielle Madeley2009-10-271-0/+7
* | | Updated Tamil translationdrtvasudevan2009-10-271-150/+135
|/ /
* | release.py: update last_tag_paternGuillaume Desmottes2009-10-271-1/+1
* | start dev of 2.29.2Guillaume Desmottes2009-10-271-2/+2
* | prepare 2.29.1 releaseEMPATHY_2_29_1Guillaume Desmottes2009-10-272-1/+129
* | dispatcher_request_handles_cb: use request_data->dispatcher to get the self p...Guillaume Desmottes2009-10-261-1/+1
* | theme_adium_parse_body: escape text between linksGuillaume Desmottes2009-10-261-2/+8
* | theme_adium_parse_body: escape all the text if smileys are disabled (#599640)Guillaume Desmottes2009-10-261-0/+2
* | theme_adium_append_event: escape textXavier Claessens2009-10-261-2/+6
* | Updated Slovenian translationMatej Urbančič2009-10-261-235/+237
* | Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safeXavier Claessens2009-10-261-2/+1
* | check-empathy-irc-network-manager: fix shadow declarationsJonny Lamb2009-10-251-6/+0
* | empathy-chat-window: Don't update the Contact menu if visibleRob Bradford2009-10-241-5/+26
* | empathy.c: document how the reference on the newly created EmpathyChat is man...Guillaume Desmottes2009-10-231-2/+9
|/
* ft-manager: allow closing the dialog with C-w or EscJonny Lamb2009-10-231-0/+17
* Set default font from Gnome system if not set in the style.Matěj Cepl2009-10-231-9/+73
* use empathy_released to check if we are releasing or notGuillaume Desmottes2009-10-231-9/+12
* Enable extra error CFLAGS in tests/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in libempathy/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in libempathy-gtk/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in src/Guillaume Desmottes2009-10-231-0/+1
* disable -Wstrict-prototypes as some GTK+ headers are buggedGuillaume Desmottes2009-10-231-1/+2
* remove m4/acinclude.m4Guillaume Desmottes2009-10-231-65/+0
* copy error flags from GabbleGuillaume Desmottes2009-10-231-1/+40
* add m4/as-compiler-flag.m4Guillaume Desmottes2009-10-231-0/+33
* copy version management from GabbleGuillaume Desmottes2009-10-231-1/+21
* empathy-protocol-chooser: don't cache TpConnectionManagerProtocol in the storeGuillaume Desmottes2009-10-231-28/+47
* Merge branch 'trivia'Guillaume Desmottes2009-10-2224-283/+300
|\
| * empathy-avatar-chooser.c: fix identationGuillaume Desmottes2009-10-221-2/+2
| * empathy-utils.c: fix casting issuesGuillaume Desmottes2009-10-221-6/+8
| * empathy-tp-contact-list.c: fix shadow declaration and uint comparaisonGuillaume Desmottes2009-10-221-6/+6
| * empathy-tp-contact-factory.c: fix casting issueGuillaume Desmottes2009-10-221-1/+1
| * empathy-time.c: fix shadow declarationGuillaume Desmottes2009-10-221-4/+4
| * empathy-status-presets.c: fix casting issuesGuillaume Desmottes2009-10-221-10/+10
| * empathy-log-store-empathy.c: fix casting issuesGuillaume Desmottes2009-10-221-12/+13
| * empathy-irc-network-manager.c: fix casting issuesGuillaume Desmottes2009-10-221-22/+29
| * empathy-dispatcher.c: fix shadow declarationsGuillaume Desmottes2009-10-221-123/+122
| * empathy-contact-groups.c: fix casting issuesGuillaume Desmottes2009-10-221-10/+11
| * empathy-connection-managers.c: fix shadow declarationsGuillaume Desmottes2009-10-221-14/+14
| * empathy-chatroom-manager.c: fix casting issuesGuillaume Desmottes2009-10-221-8/+12
| * empathy-account-settings.c: fix uint comparaisonGuillaume Desmottes2009-10-221-4/+4
| * empathy-nautilus-sendto.c: fix shadow declarationGuillaume Desmottes2009-10-221-1/+1
| * totem-subtitle-encoding.c: fix shadow declarationsGuillaume Desmottes2009-10-221-13/+13
| * empathy-ui-utils.c: fix shadow declarationGuillaume Desmottes2009-10-221-4/+4
| * empathy-theme-manager.c: fix shadow declarationsGuillaume Desmottes2009-10-221-4/+4
| * empathy-theme-boxes.c: fix shadow declarationsGuillaume Desmottes2009-10-221-3/+3
| * empathy-theme-adium.c: fix uint comparaisonsGuillaume Desmottes2009-10-221-2/+2
| * empathy-status-preset-dialog: fix uint comparaisonsGuillaume Desmottes2009-10-221-2/+2
| * empathy-contact-widget.c: fix shadow declarationsGuillaume Desmottes2009-10-221-11/+11
| * empathy-chat-text-view.c: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-221-5/+5
| * empathy-avatar-image.c: fix a casting issueGuillaume Desmottes2009-10-221-1/+2
| * empathy-avatar-chooser.c: fix casting issuesGuillaume Desmottes2009-10-221-16/+18
| * empathy-account-widget.c: fix uint comparaisonGuillaume Desmottes2009-10-221-1/+1
* | fix a comment so the style checker is happy (#599243)Guillaume Desmottes2009-10-221-1/+1