aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix distcheckEMPATHY_2_34_0Emilio Pozuelo Monfort2011-03-241-0/+3
* prepare 2.34.0Guillaume Desmottes2011-03-242-3/+40
* Calendar widget should be disabled if no contact selected (#645582)Guillaume Desmottes2011-03-242-0/+10
* Include yell before anything elseEmilio Pozuelo Monfort2011-03-241-1/+1
* log_manager_got_entities_cb: don't use the currently selected accountGuillaume Desmottes2011-03-241-17/+43
* theme-adium: keep count of the pages loading instead of using a booleanGuillaume Desmottes2011-03-241-4/+9
* Clarify the wording to indicate it's all about accountsSjoerd Simons2011-03-241-3/+8
* chat_window_new_message_cb: check that we found the chatroomGuillaume Desmottes2011-03-241-1/+1
* tp_chat_got_renamed_contacts_cb: use tp_clear_object() to unref priv->userGuillaume Desmottes2011-03-241-1/+1
* Update tools from telepathy-glibEmilio Pozuelo Monfort2011-03-2425-526/+1623
* [l10n] Updated Italian translationMilo Casagrande2011-03-241-834/+834
* Minimize the scope in which we use TpyCallChannelSjoerd Simons2011-03-231-6/+7
* Fix indentationSjoerd Simons2011-03-231-7/+6
* Prepare the video input pipeline when there is an initial contentSjoerd Simons2011-03-231-5/+17
* Wait for the channel to be ready before handling itSjoerd Simons2011-03-231-8/+43
* Use a new id for accepting without videoSjoerd Simons2011-03-231-1/+1
* Also add Answer with video to the notification dialogsSjoerd Simons2011-03-233-1/+37
* Add Answer with video to the default dialogsSjoerd Simons2011-03-231-9/+29
* Follow the sending state of the channel to determine whether we should send v...Sjoerd Simons2011-03-231-8/+14
* Update yell snapshotSjoerd Simons2011-03-231-0/+0
* Really remove user from the blocked list when readding themDanielle Madeley2011-03-231-0/+14
* Cope with gtk_icon_theme_lookup_icon returning NULLSjoerd Simons2011-03-231-0/+3
* Give the FilterResultData a reference to accountSjoerd Simons2011-03-231-1/+1
* Fix use of uninitialized variableEmilio Pozuelo Monfort2011-03-231-2/+2
* Don't try to block personas that don't support blockingEmilio Pozuelo Monfort2011-03-221-4/+11
* Set the extra-certificate-identities in EmpathyAccountsDialogStef Walter2011-03-221-0/+11
* Only add the 'extra-certificate-identities' parameter if gabble supports it.Stef Walter2011-03-223-3/+18
* Create GTalk accounts with extra-certificate-identities = 'talk.google.com'Stef Walter2011-03-221-0/+7
* Support building with libgcr 3.0Stef Walter2011-03-223-4/+3
* Use ServerTLSConnection.ReferenceIdentities to check cert identity.Stef Walter2011-03-224-8/+90
* Merge branch 'stable-block-645504-2.34' into gnome-2-34Guillaume Desmottes2011-03-225-181/+7
|\
| * stop generating API for ContactBlockingGuillaume Desmottes2011-03-223-174/+0
| * Use stable API for ContactBlocking (#645504)Guillaume Desmottes2011-03-221-6/+6
| * depends on telepathy-glib 0.14.1Guillaume Desmottes2011-03-221-1/+1
* | Updated Italian translationMilo Casagrande2011-03-221-711/+971
* | accounts_dialog_add_account: ensure that the selected account is still visibl...Guillaume Desmottes2011-03-221-1/+19
* | accounts_dialog_model_set_selected: use select_and_scroll_to_iterGuillaume Desmottes2011-03-221-1/+1
* | factor out select_and_scroll_to_iter()Guillaume Desmottes2011-03-221-14/+23
* | re-enable /msg and /query commands (#645509)Guillaume Desmottes2011-03-222-24/+38
|/
* Merge remote-tracking branch 'danni/blocking-645487' into gnome-2-34Guillaume Desmottes2011-03-221-0/+8
|\
| * Remove user from the blocked list when readding themDanielle Madeley2011-03-221-0/+8
* | account_chooser_update_iter: don't leak the TpAccountGuillaume Desmottes2011-03-221-0/+2
|/
* Also show an avatar when blocking from a conversationEmilio Pozuelo Monfort2011-03-223-3/+14
* Fix some races in the chatroom joining codeSjoerd Simons2011-03-211-31/+38
* Use the right marshal fileEmilio Pozuelo Monfort2011-03-192-2/+2
* Revert "Set an accelator on contact search"Emilio Pozuelo Monfort2011-03-181-1/+0
* Assistant: put the protocol chooser next to the labelEmilio Pozuelo Monfort2011-03-181-3/+6
* Set an accelator on contact searchGuillaume Desmottes2011-03-181-0/+1
* auth-factory: allow to handle more than one auth channel at the same time (#6...Guillaume Desmottes2011-03-181-12/+38
* auth-factory: use a proper priv pointerGuillaume Desmottes2011-03-182-3/+4
* add empathy_server_sasl_handler_get_channel()Guillaume Desmottes2011-03-182-0/+15
* Reword blocking dialog some moreDanielle Madeley2011-03-181-43/+48
* Display an avatar on the block contact dialogEmilio Pozuelo Monfort2011-03-183-39/+82
* Allow to Observe a ServerAuthentication channel while handling another oneGuillaume Desmottes2011-03-181-1/+2
* common_checks: tell the truth in debug messagesGuillaume Desmottes2011-03-181-7/+9
* common_checks: rename must_be_sasl arg to observeGuillaume Desmottes2011-03-181-2/+7
* Fix reconnect_required, which was broken by port to MxGtkLightSwitchDanielle Madeley2011-03-182-13/+22
* Optionally call a callback on Apply to do additional thingsDanielle Madeley2011-03-182-2/+50
* chat_window_contact_menu_update: unsensitive the menu if there is no submenuGuillaume Desmottes2011-03-171-4/+10
* remove released flagGuillaume Desmottes2011-03-171-1/+1
* server-sasl-handler: remove stored password if they can't be savedGuillaume Desmottes2011-03-171-0/+6
* save the password before trying to connect the new account (#643690)Guillaume Desmottes2011-03-171-0/+16
* Contact Search: close the dialog when adding a contactEmilio Pozuelo Monfort2011-03-171-0/+3
* Don't update Contact menu on a focus-in (#644936)Michael Terry2011-03-171-9/+24
* When the remote side hangs up, clean up the call channelSjoerd Simons2011-03-171-2/+9
* Cope with unexpected call channel invalidationSjoerd Simons2011-03-171-0/+20
* Use modern private structure handlingSjoerd Simons2011-03-172-3/+4
* Correct Call channel refcountingSjoerd Simons2011-03-171-4/+1
* auth-client: implement Debug interface (#645008)Guillaume Desmottes2011-03-171-0/+10
* account-widget-irc: set password-prompt param when needed (#644406)Guillaume Desmottes2011-03-171-0/+58
* prepare 2.33.4EMPATHY_2_33_4Guillaume Desmottes2011-03-162-2/+23
* Log window: grey out accounts without logsEmilio Pozuelo Monfort2011-03-161-0/+11
* Clear logs: grey out accounts without logsEmilio Pozuelo Monfort2011-03-161-0/+45
* ContactSearch: don't leak a GErrorEmilio Pozuelo Monfort2011-03-161-2/+4
* AccountChooser: All -> All accountsEmilio Pozuelo Monfort2011-03-161-1/+1
* Select the same account as in the history windowEmilio Pozuelo Monfort2011-03-161-8/+22
* Change the 'Delete logs' button to a menu entryEmilio Pozuelo Monfort2011-03-162-228/+296
* Add a empathy_account_chooser_has_all_selectedEmilio Pozuelo Monfort2011-03-162-0/+25
* set do-lost property on the gstrtpjitterbuffer elementGuillaume Desmottes2011-03-161-0/+3
* Also turn off Access Unit Delimiters (aud)David Laban2011-03-161-0/+1
* Turn off sliced-threads, some implementations have problems with decoding itSjoerd Simons2011-03-161-0/+1
* call-window: Put the details vbox in a scroll windowGuillaume Desmottes2011-03-161-2/+9
* streamed-media-window: Put the details vbox in a scroll windowGuillaume Desmottes2011-03-161-1/+8
* individual-view: call empathy_individual_manager_remove() also when the respo...Guillaume Desmottes2011-03-161-7/+5
* individual-view: use our own RESPONSE enumGuillaume Desmottes2011-03-161-6/+16
* depends on folks 0.4.0Guillaume Desmottes2011-03-1617-174/+191
* Don't start the Call when the streams startEmilio Pozuelo Monfort2011-03-162-13/+24
* client file channel file should be Call.DRAFTSjoerd Simons2011-03-151-3/+3
* Don't check the style on mx-gtk-light-switch.[ch]Emilio Pozuelo Monfort2011-03-141-2/+1
* Add depend on new GStreamer for gst_element_request_padSjoerd Simons2011-03-141-1/+2
* individual_view_remove_dialog_show: set a mnemonic on the 'Delete and Block' ...Guillaume Desmottes2011-03-141-2/+13
* Reject approval if call was hung up during approvalSjoerd Simons2011-03-141-2/+27
* Remove enabled toggle from account-widgetDanielle Madeley2011-03-141-0/+4
* Add an enabled switch to the account dialog GtkInfoBarDanielle Madeley2011-03-141-0/+63
* Reenable labels in MxGtkLightSwitchDanielle Madeley2011-03-141-9/+6
* Import MxGtkLightSwitch from MxDanielle Madeley2011-03-144-2/+617
* Merge branch 'remove-liveadder' into gnome-2-34Sjoerd Simons2011-03-145-251/+308
|\
| * Only distroy the video output if it existsSjoerd Simons2011-03-141-1/+2
| * Monitor the call state and close the channel when it endsSjoerd Simons2011-03-141-0/+17
| * Lock the hash table contents when using themSjoerd Simons2011-03-141-1/+23
| * Ensure our bin doesn't change state before being in the hash tableSjoerd Simons2011-03-141-2/+10
| * Remove live-adderSjoerd Simons2011-03-122-205/+30
| * Implement request pads for multiple sinksSjoerd Simons2011-03-122-46/+230
* | Add a .client and a .service file for empathy-callEmilio Pozuelo Monfort2011-03-113-2/+31
|/
* Empathy.Auth.client: set DelayApprovers (#644475)Guillaume Desmottes2011-03-111-0/+3
* Update the wording of the other contact blocking dialogDanielle Madeley2011-03-111-3/+4
* Reword 'Remove Contact'Danielle Madeley2011-03-111-3/+3
* Update the wording of the contact blocking dialogDanielle Madeley2011-03-111-15/+56
* Display Upgrade Software errorsEmilio Pozuelo Monfort2011-03-112-0/+136
* Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call failsEmilio Pozuelo Monfort2011-03-101-0/+2
* Bump tp-glib requirement for the new errorsEmilio Pozuelo Monfort2011-03-101-1/+1
* Fix a couple of 'may be used uninitialized' warningsEmilio Pozuelo Monfort2011-03-101-2/+2
* media_type is of type FsMediaType, so use that enum to compareSjoerd Simons2011-03-101-2/+2
* remove released flagGuillaume Desmottes2011-03-091-1/+1
* add 2.33.3 release notesEMPATHY_2_33_3Guillaume Desmottes2011-03-091-0/+7
* coding style fixesGuillaume Desmottes2011-03-092-2/+2
* prepare 2.33.3Guillaume Desmottes2011-03-092-2/+19
* Revert "libempathy-gtk: In TLS Dialog allow remembering of any exception."Guillaume Desmottes2011-03-091-6/+15
* remove released flagGuillaume Desmottes2011-03-091-1/+1
* contact-search-dialog: fix compilation warningsGuillaume Desmottes2011-03-091-1/+1
* libempathy-gtk: In TLS Dialog allow remembering of any exception.Stef Walter2011-03-091-15/+6
* Update to telepathy-yell masterGuillaume Desmottes2011-03-091-0/+0
* display a debug message if we can't get the TpContactGuillaume Desmottes2011-03-091-1/+4
* call-observer: display a notification when rejecting a call (#644127)Guillaume Desmottes2011-03-093-8/+92
* call-observer: set the Recover flagGuillaume Desmottes2011-03-091-1/+1
* call-observer: reject all the channels we claimedGuillaume Desmottes2011-03-091-7/+74
* return from ObserveChannels() after having called Claim()Guillaume Desmottes2011-03-091-0/+2
* call-observer: return from ObserveChannels() if the channel was already inval...Guillaume Desmottes2011-03-091-0/+2
* call-observer: set debug domain to 'voip' and add 2 debug messagesGuillaume Desmottes2011-03-091-1/+6
* Update the repository to freedesktop.orgSjoerd Simons2011-03-081-1/+1
* Delay the approversEmilio Pozuelo Monfort2011-03-071-0/+2
* Autoreject incoming calls if there are others in progressEmilio Pozuelo Monfort2011-03-075-0/+346
* Show a profile info button in contact search resultsEmilio Pozuelo Monfort2011-03-071-0/+55
* Use the special "" search field if the CM supports itEmilio Pozuelo Monfort2011-03-071-1/+5
* account-assistant: add mnemonic for the "no salut account" checkbox (#644058)Guillaume Desmottes2011-03-071-2/+2
* empathy_protocol_name_to_display_name: MSN has been renamed to "Windows live"...Guillaume Desmottes2011-03-071-1/+1
* auth-factory: set Observer.DelayApprovers (#643872)Guillaume Desmottes2011-03-071-0/+2
* depends on telepathy-glib 0.13.16Guillaume Desmottes2011-03-071-1/+1
* Warn the user if she has insufficient disk space to receive a fileDanielle Madeley2011-03-071-3/+58
* tp_chat_received_cb: display the path of the channel in debug logGuillaume Desmottes2011-03-041-1/+2
* Emit RESPONSE_APPLY on row-activatedDanielle Madeley2011-03-031-0/+12
* Contact Search Dialog: Search when enter is pressedDanielle Madeley2011-03-031-1/+3
* Fix compiler warningDanielle Madeley2011-03-031-0/+1
* Change 'Add' to 'Add Contact'Danielle Madeley2011-03-031-1/+3
* Tweak ContactSearchDialog paddingDanielle Madeley2011-03-031-13/+17
* Only show the "Remember password" tickybox if we can do thatDanielle Madeley2011-03-033-1/+44
* Implement MaySaveResponse and Ch.I.CredentialsStorage in SASL handlerDanielle Madeley2011-03-031-3/+40
* Add Chan.I.CredentialsStorage to extensionsDanielle Madeley2011-03-033-0/+61
* Add support for message type to support /meNicolas Dufresne2011-03-011-0/+2
* Return meaningful errors when starting a call failsEmilio Pozuelo Monfort2011-02-281-1/+22
* find_items_cb: copy the string stored in the resultGuillaume Desmottes2011-02-281-1/+2
* find_items_cb: always use the first password foundGuillaume Desmottes2011-02-281-5/+14
* accounts_dialog_set_selected_account: scroll to the selected accountGuillaume Desmottes2011-02-281-1/+14
* empathy-accounts: allow to pass the full path of the accountGuillaume Desmottes2011-02-281-2/+6
* Request a minimal size on the presence chooserRobert Sajdok2011-02-281-0/+1
* update src/.gitignoreGuillaume Desmottes2011-02-251-0/+2
* Correct submodule pathSjoerd Simons2011-02-251-1/+1
* prepare 2.33.2EMPATHY_2_33_2Guillaume Desmottes2011-02-252-2/+39
* Add missing files to POTFILES.inEmilio Pozuelo Monfort2011-02-251-0/+5
* Add a button to delete logsEmilio Pozuelo Monfort2011-02-242-11/+96
* Update the Logger dbus API for the new versionEmilio Pozuelo Monfort2011-02-241-67/+47
* Indentation fixEmilio Pozuelo Monfort2011-02-241-21/+21
* Log window: free the entities together with the listEmilio Pozuelo Monfort2011-02-241-3/+1
* Check for the right telepathy-logger pc fileEmilio Pozuelo Monfort2011-02-241-1/+1
* Log window: don't leak the accountEmilio Pozuelo Monfort2011-02-241-1/+1
* Unref the entity when we're doneEmilio Pozuelo Monfort2011-02-241-0/+2
* Port empathy to Telepathy logger 0.2.0Nicolas Dufresne2011-02-247-146/+144
* Keep a ref to our handler instanceSjoerd Simons2011-02-241-1/+1
* tls-dialog: destroy the dialog if the certificate is invalidated (#643186)Guillaume Desmottes2011-02-241-0/+13
* More consistent naming of the call handler optionSjoerd Simons2011-02-241-2/+3
* make the dots consistentSjoerd Simons2011-02-241-1/+1
* escape USE_MAINTAINER_MODE to prevent errors from makeSjoerd Simons2011-02-241-1/+1
* auto-detect the presence of farsightSjoerd Simons2011-02-241-3/+14
* empathy_call_new_with_streams: prefer StreamedMedia over CallEmilio Pozuelo Monfort2011-02-241-13/+13
* Always build telepathy-yell and handle Call channelsEmilio Pozuelo Monfort2011-02-245-41/+6
* Show an error dialog if starting a call failsEmilio Pozuelo Monfort2011-02-241-1/+25
* Don't require EmpathyContacts to start a callEmilio Pozuelo Monfort2011-02-247-64/+30
* Move empathy_call_* util functions to libempathy-gtkEmilio Pozuelo Monfort2011-02-2410-145/+224
* No need to borrow the connection, it gets passed to usSjoerd Simons2011-02-241-1/+0
* Trivial coding style fix (>80 chars)Sjoerd Simons2011-02-241-1/+2
* Retrieve the contact for incoming calls so we can display itSjoerd Simons2011-02-241-3/+24
* Stop ringing after approving a Channel.Type.Call channelSjoerd Simons2011-02-241-1/+2
* event-manager Remove HAVE_CALL ifdefs, even if we didn't build the handler we...Sjoerd Simons2011-02-241-15/+1
* Close call channels after hanging upSjoerd Simons2011-02-241-0/+1
* Update telepathy-yell submoduleSjoerd Simons2011-02-231-0/+0
* In gtk2 GtkProgressBar doesn't implement GTK_ORIENTABLESjoerd Simons2011-02-232-10/+3
* Explicitely use the libtelepathy-yell .la file for dependency trackingSjoerd Simons2011-02-231-1/+1
* Remove stray debugSjoerd Simons2011-02-231-9/+1
* Only change the UI in the main threadSjoerd Simons2011-02-231-2/+11
* Use target-contact instead of membersSjoerd Simons2011-02-231-56/+18
* Move to using ->priv pointer in the object instanceSjoerd Simons2011-02-232-7/+7
* coding style triviaSjoerd Simons2011-02-231-3/+6
* Add TargetContact property that's guaranteed to exist on CallHandlerSjoerd Simons2011-02-233-8/+51
* Recognize Call channel capabilitiesSjoerd Simons2011-02-231-0/+24
* Don't use wildcards for just one marshal fileSjoerd Simons2011-02-231-4/+4
* Initialize GObjectEmilio Pozuelo Monfort2011-02-231-1/+1
* Build fixEmilio Pozuelo Monfort2011-02-231-0/+8
* Temporarily disable some codeEmilio Pozuelo Monfort2011-02-231-2/+5
* Don't use tpy_call_channel_is_sending_videoEmilio Pozuelo Monfort2011-02-231-2/+2
* Don't use tpy_call_channel_is_receiving_videoEmilio Pozuelo Monfort2011-02-231-34/+2
* Call: check for priv->members to enable the video buttonEmilio Pozuelo Monfort2011-02-231-1/+1
* Build fixEmilio Pozuelo Monfort2011-02-231-2/+2
* Add empathy-callEmilio Pozuelo Monfort2011-02-231-0/+195
* Use the new empathy_call_create_call_request thoroughlyEmilio Pozuelo Monfort2011-02-233-25/+2
* empathy_call_new_with_streams: start Calls when we support themEmilio Pozuelo Monfort2011-02-232-15/+91
* Initialize telepathy-yellEmilio Pozuelo Monfort2011-02-231-0/+6
* Show notifications for CallsEmilio Pozuelo Monfort2011-02-231-0/+1
* EmpathyEventManager: handle Call channelsEmilio Pozuelo Monfort2011-02-232-4/+95
* Teach EmpathyChannelFactory how to create Call channelsEmilio Pozuelo Monfort2011-02-232-0/+19
* NewCallDialog: support CallsEmilio Pozuelo Monfort2011-02-232-36/+43
* Build an empathy-call binary when we have Call supportEmilio Pozuelo Monfort2011-02-233-1/+33
* Add an EmpathyCallWindowFullscreen classEmilio Pozuelo Monfort2011-02-232-0/+386
* Add an EmpathyCallWindow classEmilio Pozuelo Monfort2011-02-232-0/+3369
* Add an EmpathyCallHandler classEmilio Pozuelo Monfort2011-02-232-0/+1119
* Add an EmpathyCallFactory classEmilio Pozuelo Monfort2011-02-232-0/+414
* Check for telepathy-yell if requestedEmilio Pozuelo Monfort2011-02-232-1/+30
* Add telepathy-yell as a submoduleEmilio Pozuelo Monfort2011-02-232-0/+3
* Add ax_config_dir from audacityEmilio Pozuelo Monfort2011-02-231-0/+109
* Ship a 256x256 version of the Empathy iconGuillaume Desmottes2011-02-222-0/+1
* Fix make distcheckEmilio Pozuelo Monfort2011-02-221-1/+1
* Prevent segv attempting to free uninitialised value.Danielle Madeley2011-02-211-1/+1
* Move farsight-using sources to srcEmilio Pozuelo Monfort2011-02-2111-15/+14
* ensure that the theme manager stay aliveGuillaume Desmottes2011-02-181-0/+6
* empathy_theme_manager_dup_singleton: act as a proper dup singleton functionGuillaume Desmottes2011-02-181-2/+5
* Bug 637151 — Hide the user Individual from the contact listPhilip Withnall2011-02-1811-27/+59
* Bug 641662 — Update for libfolks API changes to IndividualAggregatorPhilip Withnall2011-02-181-2/+31
* accounts: release our ref on the TpDBusDaemonGuillaume Desmottes2011-02-171-0/+1
* empathy_account_settings_check_readyness: don't leak a ref on managerGuillaume Desmottes2011-02-171-1/+1
* rename empathy_theme_manager_get() to empathy_theme_manager_dup_singleton()Guillaume Desmottes2011-02-174-5/+11
* folks favorite API has changedGuillaume Desmottes2011-02-171-2/+2
* Always display favorite contacts (#592595)Guillaume Desmottes2011-02-171-1/+4
* 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
* Reset network list buttonChandni Verma2011-02-155-12/+110
* Merge branch 'report-abuse' into gnome-2-34Danielle Madeley2011-02-1516-669/+266
|\
| * Use tp_g_signal_connect_object for Tp proxies that outlive the CB dialogDanielle Madeley2011-02-151-4/+6
| * Use Conn.I.CB to report contacts as abusive when blocking themDanielle Madeley2011-02-141-2/+11
| * Only destroy block confirmation dialogs after we've read out the abusive stateDanielle Madeley2011-02-142-3/+3
| * Determine whether a connection supports reporting abuse, set the connection flagDanielle Madeley2011-02-141-0/+36
| * Add draft Conn.I.ContactBlocking (danni's version) to extensionsDanielle Madeley2011-02-143-0/+174
| * Hook up abusive argument into TpContactList backendDanielle Madeley2011-02-149-17/+30
| * use TP_PROP_*Guillaume Desmottes2011-02-141-5/+5
| * Stop generating Conference APIGuillaume Desmottes2011-02-143-637/+0
| * use tp-glib API for Conference (#630709)Guillaume Desmottes2011-02-141-4/+4
* | password-dialog: activate the dialog when the entry is activated (#642296)Guillaume Desmottes2011-02-141-0/+9
* | irc-network-chooser: recreate the default IRC network if needed (#641861)Guillaume Desmottes2011-02-141-1/+18
|/
* Merge branch 'contact-blocking-3' into gnome-2-34Danielle Madeley2011-02-1126-33/+1686
|\