aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add empathy_context_menu_new()Guillaume Desmottes2011-02-162-0/+36
* accounts-dialog: only update the row which have actually been changed; may fi...Guillaume Desmottes2011-02-161-1/+15
* ft-factory: don't leak the handlerGuillaume Desmottes2011-02-161-0/+12
* fix coding styleGuillaume Desmottes2011-02-161-10/+13
* Add some more servers and port numbers for FreenodeDebarshi Ray2011-02-161-2/+7
* only try reconnecting accounts if needed (#642358)Guillaume Desmottes2011-02-164-5/+31
* set 'Empathy' as program class in all binariesGuillaume Desmottes2011-02-165-0/+11
* Updated Spanish translationDaniel Mustieles2011-02-161-8/+11
* Merge remote branch 'glassrose/Reset-network-list-button-642264'Guillaume Desmottes2011-02-155-12/+110
|\
| * Reset network list buttonChandni Verma2011-02-155-12/+110
* | Updated French translationBruno Brouard2011-02-151-685/+818
* | [l10n] Updated Estonian translationIvar Smolin2011-02-141-5/+5
* | password-dialog: activate the dialog when the entry is activated (#642296)Guillaume Desmottes2011-02-141-0/+9
* | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2011-02-142-878/+1027
* | irc-network-chooser: recreate the default IRC network if needed (#641861)Guillaume Desmottes2011-02-141-1/+18
* | Updated Galician translationsFran Diéguez2011-02-131-147/+152
* | Updated Norwegian bokmål translation.Kjartan Maraas2011-02-121-148/+148
* | Updated Spanish translationDaniel Mustieles2011-02-121-186/+188
* | Updated Hebrew translation.Yaron Shahrabani2011-02-121-146/+146
|/
* Updated Arabic translationKhaled Hosny2011-02-111-146/+146
* Updated Swedish translationDaniel Nylander2011-02-111-197/+197
* account-settings: cope with g_regex_new returning NULLGuillaume Desmottes2011-02-101-1/+9
* string-parser: properly handle if g_regex_new() failsGuillaume Desmottes2011-02-101-1/+13
* add EmpathyChannelFactory (#634679)Guillaume Desmottes2011-02-103-0/+186
* connectivity: Update to use new Connman D-BUS service names / interfacesRob Bradford2011-02-101-2/+2
* improve phrasing of the subscription request messageGuillaume Desmottes2011-02-101-1/+1
* Only link empathy-av against farsightEmilio Pozuelo Monfort2011-02-102-2/+9
* Only build the EmpathyStreamedMedia* classes for empathy-avEmilio Pozuelo Monfort2011-02-108-28/+29
* Move a couple of call-related functions to empathy-utils.hEmilio Pozuelo Monfort2011-02-107-91/+80
* EmpathyCallFactory -> EmpathyStreamedMediaFactoryEmilio Pozuelo Monfort2011-02-1014-151/+146
* Generate closures for src/Emilio Pozuelo Monfort2011-02-101-1/+22
* accounts: fill in the right categories to show up in control-centerCosimo Cecchi2011-02-101-1/+1
* cc-panel: make sure to always pack a widget during constructionCosimo Cecchi2011-02-101-1/+10
* ::new-call-handler -> ::new-streamed-media-handlerEmilio Pozuelo Monfort2011-02-092-2/+2
* Updated Gujarati TranslationsSweta Kothari2011-02-091-1055/+2331
* GNOME is not using CVS for a whileLaurent Bigonville2011-02-081-1/+1
* always color the room label when we are highlightedGuillaume Desmottes2011-02-071-1/+2
* use tp_clear_object()Guillaume Desmottes2011-02-071-17/+4
* tp-file: use the self->priv patternGuillaume Desmottes2011-02-072-220/+182
* depends on telepathy-glib 0.13.12Guillaume Desmottes2011-02-071-1/+1
* Set FileTransfer.URI when accepting a file (#641707)Guillaume Desmottes2011-02-071-10/+39
* set FileTransfer.URI on outgoing FTGuillaume Desmottes2011-02-071-0/+5
* Updated Norwegian bokmål translation.Kjartan Maraas2011-02-071-306/+329
* Updated Arabic translationKhaled Hosny2011-02-051-221/+256
* Updated Hebrew translation.Yaron Shahrabani2011-02-041-180/+212
* EmpathyCallWindowFullscreen -> EmpathyStreamedMediaFullscreenEmilio Pozuelo Monfort2011-02-035-158/+158
* EmpathyCallWindow -> EmpathyStreamedMediaWindowEmilio Pozuelo Monfort2011-02-038-419/+419
* EmpathyCallHandler -> EmpathyStreamedMediaHandlerEmilio Pozuelo Monfort2011-02-039-253/+253
* EmpathyTpCall -> EmpathyTpStreamedMediaEmilio Pozuelo Monfort2011-02-0310-297/+308
* individual-view: properly unref the tooltip_widget when disposing (#641157)Guillaume Desmottes2011-02-031-6/+2
* contact-list-view: backport fixes from individual_view_popup_menu_idle_cbGuillaume Desmottes2011-02-031-2/+20
* individual-menu: ensure that the contact stays alive while the activate signa...Guillaume Desmottes2011-02-031-2/+4
* individual-view: detach the individual menu once it has been displayedGuillaume Desmottes2011-02-031-0/+20
* individual_view_popup_menu_idle_cb: remove useless sink/unrefGuillaume Desmottes2011-02-031-2/+0
* Updated Galician translationsFran Diéguez2011-02-031-88/+117
* [l10n] Updated Estonian translationIvar Smolin2011-02-031-2/+2
* update Punjabi Translation by A S AlamA S Alam2011-02-031-315/+396
* Updated Spanish translationDaniel Mustieles2011-02-031-55/+85
* [l10n] Updated Estonian translationIvar Smolin2011-02-031-5/+27
* individual-widget: use priv->contact as that's our pointer on the TpContact nowGuillaume Desmottes2011-02-021-2/+1
* empathy_contact_get_presence_message: use the tp_contact if there is no perso...Guillaume Desmottes2011-02-011-4/+5
* remove released flagGuillaume Desmottes2011-02-011-1/+1
* Fix distcheckEMPATHY_2_91_6_1Emilio Pozuelo Monfort2011-02-011-0/+3
* Merge branch 'release'Guillaume Desmottes2011-02-012-2/+13
|\
| * prepare 2.91.6.1Guillaume Desmottes2011-02-012-2/+13
* | Updated Swedish translationDaniel Nylander2011-02-011-287/+306
|/
* Update tools from telepathy-glibEmilio Pozuelo Monfort2011-02-0125-526/+1623
* individual-widget: connect on the notify::client-types only onceGuillaume Desmottes2011-02-011-10/+14
* remove released flagGuillaume Desmottes2011-02-011-1/+1
* prepare 2.91.6EMPATHY_2_91_6Guillaume Desmottes2011-02-012-3/+42
* coding style fixGuillaume Desmottes2011-02-011-1/+1
* add empathy-contact-search-dialog.c to POTFILES.inGuillaume Desmottes2011-02-011-0/+1
* Merge branch 'muc-password'Jonny Lamb2011-02-017-75/+365
|\
| * keyring: use the recently added finish macrosJonny Lamb2011-02-011-70/+9
| * utils: add the _finish macros from wockyJonny Lamb2011-02-011-0/+45
| * chat: save room passwords in the keyring if requestedJonny Lamb2011-01-291-1/+11
| * keyring: add set_room_password functionsJonny Lamb2011-01-292-0/+69
| * keyring: fix typoJonny Lamb2011-01-291-1/+1
| * chat: try to use a room password from the keyring or offer to save the passwordJonny Lamb2011-01-291-8/+159
| * keyring: add get_room_password_{async,finish} functionsJonny Lamb2011-01-292-0/+62
| * keyring: add is_available functionJonny Lamb2011-01-292-0/+8
| * keyring: rename current functions to be more specifically about account passw...Jonny Lamb2011-01-285-34/+40
* | Bump the Folks requirement to match reality.Travis Reitter2011-02-011-1/+1
* | Updating Galician translationsFran Diéguez2011-02-011-159/+163
* | Adjust for FolksHasPresence -> FolksPresenceOwnerTravis Reitter2011-02-016-46/+51
* | Adjust for FolksHasAvatar -> FolksAvatarOwnerTravis Reitter2011-02-011-1/+1
* | Updated Hebrew translation.Yaron Shahrabani2011-01-311-240/+240
* | [l10n] Updated Estonian translationIvar Smolin2011-01-301-20/+21
* | Updated Spanish translationDaniel Mustieles2011-01-291-244/+243
* | Updated Czech translationMarek Černocký2011-01-281-152/+155
|/
* chat: add clear secondary icon to password entryJonny Lamb2011-01-281-0/+31
* chat: make the password entry growJonny Lamb2011-01-281-4/+4
* chat: display a spinner when attempting a MUC passwordJonny Lamb2011-01-281-46/+84
* Main window: mark Edit→Context as untranslatable.Will Thompson2011-01-281-1/+1
* Add Contact Search supportEmilio Pozuelo Monfort2011-01-287-1/+653
* Remove EMPATHY_PREFS_ACCOUNTS_SCHEMA leftoversYanko Kaneti2011-01-282-3/+0
* Updated Arabic translationKhaled Hosny2011-01-271-1025/+742
* QA of Galician translationsFran Diéguez2011-01-271-108/+106
* Merge branch 'presence-manager-640532'Guillaume Desmottes2011-01-2613-852/+819
|\
| * use tp_g_signal_connect_object()Guillaume Desmottes2011-01-251-22/+6
| * presence-manager: add a dispose function and use tp_clear_*Guillaume Desmottes2011-01-251-14/+23
| * presence_manager_finalize: chain upGuillaume Desmottes2011-01-251-0/+2
| * use the self->priv pattern rather than GET_PRIV()Guillaume Desmottes2011-01-252-171/+111
| * presence-manager: port to new coding styleGuillaume Desmottes2011-01-252-540/+570
| * rename EmpathyIdle to EmpathyPresenceManager (#640532)Guillaume Desmottes2011-01-2512-195/+197
* | empathy-chat: disable file transfer for nowGuillaume Desmottes2011-01-251-1/+0
* | add EMPATHY_CONTACT_FEATURE_FTGuillaume Desmottes2011-01-254-4/+9
|/
* main-window: use line-wrap for "no match" labelDiego Escalante Urrelo2011-01-251-2/+2
* Updated Basque languageInaki Larranaga Murgoitio2011-01-251-120/+88
* use action_camera_on when using the camera action itemsGuillaume Desmottes2011-01-241-8/+6
* call-window: sync the sensitivity of the button and "send video" menu (#637839)Guillaume Desmottes2011-01-242-0/+6
* call-window: remove unused priv->action_camera_previewGuillaume Desmottes2011-01-241-2/+0
* chat-window: don't play sound for pending messages (#639302)Guillaume Desmottes2011-01-241-5/+6
* Merge remote branch 'glassrose/remove-typing-icon-in-muc-tabs-609420'Guillaume Desmottes2011-01-241-2/+2
|\
| * Do not display typing icon in MUC tabsChandni Verma2011-01-241-2/+2
* | account-widget-yahoo: remove server field (#634853)Guillaume Desmottes2011-01-242-33/+4
* | account-dialog: keep a proper weak ref on setting_widget_objectGuillaume Desmottes2011-01-241-3/+16
* | Add calendar to the contact widget in order to simplify birthday selection (#...Vitaly Minko2011-01-241-9/+63
* | [l10n] Updated German translationMario Blättermann2011-01-211-617/+755
* | Updated Basque languageInaki Larranaga Murgoitio2011-01-211-698/+838
* | Updated Russian translationYuri Myasoedov2011-01-211-652/+790
* | Updated Czech translationMarek Černocký2011-01-201-637/+746
* | Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'Guillaume Desmottes2011-01-184-2/+74
|\ \
| * | Display typing icon in MUC contact-listChandni Verma2011-01-184-2/+74
| |/
* | remove released flagGuillaume Desmottes2011-01-181-1/+1
* | prepare 2.91.5.1EMPATHY_2_91_5_1Guillaume Desmottes2011-01-182-2/+20
* | Empathy.Auth.client: fix handling and observing SASL channelsJonny Lamb2011-01-181-2/+2
* | Improve connected/disconnected notifications (#639352)Guillaume Desmottes2011-01-141-6/+8
* | Updated Slovenian translationAndrej Žnidaršič2011-01-141-3/+3
* | Updated Greek translationMichael Kotsarinis2011-01-131-624/+760
* | Chat command nick modified to use RequestRename instead of SetAliasesChandni Verma2011-01-131-11/+15
* | Allow /nick command only in chatrooms that support nick renamingChandni Verma2011-01-131-14/+43
* | Added Connection.Interface.Renaming to /extensionsChandni Verma2011-01-133-0/+100
* | Updated Hungarian translationGabor Kelemen2011-01-121-634/+739
* | Updated Norwegian bokmål translationKjartan Maraas2011-01-121-57/+56
* | account-chooser: setup the combobox once the object has been constructed (#63...Guillaume Desmottes2011-01-111-1/+9
* | Pressing F2 opens the Edit Contact Information window for #586257Kushal Das2011-01-111-1/+22
* | Don't use deprecated gdk_app_launch_context_new()Emilio Pozuelo Monfort2011-01-113-10/+9
* | Connect to style-updated signalEmilio Pozuelo Monfort2011-01-111-5/+4
* | Don't use deprecated gtk_widget_get_style()Emilio Pozuelo Monfort2011-01-111-1/+5
* | Don't use deprecated gdk_keyboard_grab/ungrabEmilio Pozuelo Monfort2011-01-111-8/+27
* | Port to GtkStyleContextEmilio Pozuelo Monfort2011-01-112-7/+13
* | Don't use deprecated gtk_paint_expander()Emilio Pozuelo Monfort2011-01-111-8/+6
* | remove released flagGuillaume Desmottes2011-01-111-1/+1
* | prepare 2.91.5EMPATHY_2_91_5Guillaume Desmottes2011-01-102-2/+25
* | Patch to transfer window to allow opening file with double clicks for #637195Kushal Das2011-01-101-7/+27
* | Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'Guillaume Desmottes2011-01-104-71/+77
|\ \
| * | Skip accounts which don't support rooms in "Manage Favorites" dialogChandni Verma2011-01-034-71/+77
* | | Updated Galician translationsFran Diéguez2011-01-091-180/+220
| |/ |/|
* | Updated Norwegian bokmål translation from Torstein Adolf WintersethKjartan Maraas2011-01-031-69/+87
* | [l10n] Updated Estonian translationMattias Põldaru2010-12-311-2/+9
* | Updated Swedish translationDaniel Nylander2010-12-301-694/+810
* | Remove the chats_new_msg list from EmpathyChatWindowSjoerd Simons2010-12-291-17/+9
* | Remove the composing listSjoerd Simons2010-12-293-15/+11
* | Highlight both the tab and the menu labelSjoerd Simons2010-12-291-2/+6
* | Fix lines > 80 charsSjoerd Simons2010-12-291-2/+4
* | Prevent potential freeing of unitialized dataSjoerd Simons2010-12-291-4/+4
* | Simplify filter adding code by just using gdk_x11 functions instead of hoopsSjoerd Simons2010-12-291-10/+8
* | Also turn off Access Unit Delimiters (aud)David Laban2010-12-291-0/+1
* | update Punjabi TranslationA S Alam2010-12-291-311/+375
* | Updated Slovenian translationMatej Urbančič2010-12-291-179/+217
* | Updated Hebrew translation.Yaron Shahrabani2010-12-271-30/+39
* | Updated Spanish translationDaniel Mustieles2010-12-251-36/+43
* | libempathy: Fix free of uninitialized variables.Stef Walter2010-12-241-0/+3
* | libempathy: Store pinned certificate for end entity cert in the chain.Stef Walter2010-12-241-6/+21
* | tests: Fix memory leak of dbus connectionStef Walter2010-12-241-0/+3
* | libempathy: Fix memory leaks and use consistent naming for various arrays.Stef Walter2010-12-241-15/+16
* | libempathy: Fix leak of certificate data.Stef Walter2010-12-241-0/+1
* | libempathy, tests: Wrap new function arguments properly.Stef Walter2010-12-242-16/+35
* | tests: Lookup the pkcs11 standalone directory at run time.Stef Walter2010-12-243-8/+20
* | libempathy: Match changes in libgcr terminology and debug output.Stef Walter2010-12-241-2/+29
* | libempathy: Use new certificate chain facilities in libgcrStef Walter2010-12-241-188/+103
* | test: Add tests which load PKCS#11 modules for TLS verification.Stef Walter2010-12-244-45/+242
* | libempathy: Complete successful verification properly.Stef Walter2010-12-241-0/+1
* | tests: Add test for basic verification.Stef Walter2010-12-241-13/+47
* | libempathy: Fix reference counting of certs in verifier.Stef Walter2010-12-241-2/+4
* | tests: Add mock object and test infrastructure for testing tls.Stef Walter2010-12-244-1/+362
* | libempathy: Use new gcr functions properly and fix build.Stef Walter2010-12-241-4/+12
* | libempathy: Load complete certificate chain even when not sent.Stef Walter2010-12-241-53/+133
* | configure: Remove option to specify system certificates.Stef Walter2010-12-241-33/+0
* | libempathy: Store certificate exceptions in gnome-keyring.Stef Walter2010-12-245-133/+33
* | libempathy: Use trust assertions instead of certificate directories.Stef Walter2010-12-243-338/+125
* | prepare 2.91.4.3EMPATHY_2_91_4_3Guillaume Desmottes2010-12-242-2/+18
* | Depends on gcr 2.91.4Guillaume Desmottes2010-12-241-1/+2
* | just include gcr.hGuillaume Desmottes2010-12-241-1/+1
* | libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch]Stef Walter2010-12-244-197/+1
* | Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'Danielle Madeley2010-12-241-0/+95
|\ \
| * | Popup menu feature to quickly enable/disable an account.Chandni Verma2010-12-241-0/+95
* | | Added UG translationGheyret T.Kenji2010-12-241-392/+439
* | | remove released flagGuillaume Desmottes2010-12-231-1/+1
* | | prepare 2.91.4.2EMPATHY_2_91_4_2Guillaume Desmottes2010-12-233-1/+7
* | | Merge branch 'release.py'Guillaume Desmottes2010-12-232-2/+13
|\ \ \
| * | | prepare 2.91.4.1EMPATHY_2_91_4_1Guillaume Desmottes2010-12-232-2/+13
* | | | Fix build warnings for uninitialized variablesXavier Claessens2010-12-233-3/+3
|/ / /
* | | account-widget: use g_app_info_launch() instead of gdk_spawn_on_screen() (#63...Guillaume Desmottes2010-12-231-14/+30
* | | main-window: use g_app_info_launch() instead of gdk_spawn_on_screen() (#637854)Guillaume Desmottes2010-12-231-7/+16
* | | accounts-dialog: use g_app_info_launch() instead of gdk_spawn_on_screen() (#6...Guillaume Desmottes2010-12-231-14/+25
* | | gdk_xid_table_lookup has been deprecated (#637855)Guillaume Desmottes2010-12-231-1/+2
* | | Don't display any contact menu for muc chatsGuillaume Desmottes2010-12-221-6/+0
* | | chat-window: unsensitive the Contact menu if there is no submenu (#637799)Guillaume Desmottes2010-12-221-2/+8
* | | account-settings: only remove the MC password param if set in the keyring OKJonny Lamb2010-12-221-12/+30
* | | account-settings: use tp_account_get_path_suffixJonny Lamb2010-12-221-5/+3
* | | account-settings: add a comment saying what to remove when purging migration ...Jonny Lamb2010-12-221-1/+2
* | | account-settings: move the migration code to another functionJonny Lamb2010-12-221-45/+54
* | | account-settings: migrate passwords from MC to gk ourselvesJonny Lamb2010-12-221-0/+47
* | | disable maintainer mode for nowGuillaume Desmottes2010-12-211-2/+3
* | | Fix build warningXavier Claessens2010-12-211-2/+2
* | | remove released flagGuillaume Desmottes2010-12-201-1/+1
* | | prepare 2.91.4 releaseEMPATHY_2_91_4Guillaume Desmottes2010-12-202-3/+28
* | | Turn off sliced-threads, some implementations have problems with decoding itSjoerd Simons2010-12-201-0/+1
* | | [l10n] Updated Estonian translationMattias Põldaru2010-12-201-32/+64
* | | Updated Esperanto translationKristjan SCHMIDT2010-12-191-955/+1498
* | | Updated Hebrew translation.Yaron Shahrabani2010-12-191-113/+136
* | | Updated Spanish TranslationDaniel Mustieles2010-12-181-9/+5
* | | Updated Norwegian bokmål translationKjartan Maraas2010-12-171-166/+194
* | | password-dialog: make OK insensitive unless there's a password setJonny Lamb2010-12-171-5/+12
* | | Make empathy-persona-view include empathy-ui-utilsSjoerd Simons2010-12-171-0/+1
* | | Updated Spanish translationDaniel Mustieles2010-12-161-166/+206
* | | Merge branch 'gtk-style-636654'Guillaume Desmottes2010-12-1610-56/+65
|\ \ \
| * | | depends on GTK+ 2.91.6 as we use the new style APIGuillaume Desmottes2010-12-151-1/+1
| * | | remove useless paranthesisGuillaume Desmottes2010-12-151-3/+3
| * | | persona-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-11/+10
| * | | individual-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-11/+10
| * | | contact-list-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-10/+9
| * | | factor out empathy_make_color_whiter()Guillaume Desmottes2010-12-153-4/+14
| * | | account-widget: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-12/+16
| * | | status-preset-dialog: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-4/+4
| * | | chat-text-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-1/+1
| * | | video-widget: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-6/+4
* | | | use tp_account_get_path_suffix()Guillaume Desmottes2010-12-151-4/+1
* | | | show the account UI even if the selected account doesn't existGuillaume Desmottes2010-12-151-0/+2
* | | | always set account_manager_preparedGuillaume Desmottes2010-12-151-1/+2
* | | | get the value of selected_account_name in the callback (#637307)Guillaume Desmottes2010-12-151-4/+3
* | | | empathy-accounts: no need to get argv, we don't use itGuillaume Desmottes2010-12-151-7/+0
|/ / /
* | | password-dialog: destroy the dialog if the handler is invalidatedJonny Lamb2010-12-151-0/+11
* | | keyring: change display name for passwords to be more human-readableJonny Lamb2010-12-151-1/+2
* | | server-sasl-handler: add more debugging and only call Close in Status_SucceededJonny Lamb2010-12-151-1/+5
* | | Merge branch 'sasl-gui'Jonny Lamb2010-12-1521-138/+1161
|\ \ \
| * | | main-window: s/Cancel/Disconnect/ when not giving a passwordJonny Lamb2010-12-151-1/+1
| * | | main-window: don't use _full functions where not necessaryJonny Lamb2010-12-151-4/+1
| * | | main-window: document what the key and value types are for hash tablesJonny Lamb2010-12-151-0/+4
| * | | event-manager: use tp_clear_objectJonny Lamb2010-12-151-9/+2
| * | | auth-factory: add a comment as to why we're also an approverJonny Lamb2010-12-151-0/+6
| * | | account-settings: use tp_clear_object in disposeJonny Lamb2010-12-151-19/+5
| * | | configure: depend on the newest tp-glib for the new auth types stuffJonny Lamb2010-12-131-1/+1
| * | | account-widget: add Remember Password widgets for all the other protocolsJonny Lamb2010-12-107-24/+281
| * | | account-widget: only show Remember Password ticky box if the CM supports SASLJonny Lamb2010-12-101-1/+7
| * | | account-settings: add _supports_sasl functionJonny Lamb2010-12-102-0/+10
| * | | account-settings: don't block notify::ready on getting a passwordJonny Lamb2010-12-102-6/+55
| * | | status-icon: blink when we get a password requestJonny Lamb2010-12-102-5/+6