Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cope with tp-glib calling the callback in sync | Sjoerd Simons | 2010-02-25 | 1 | -16/+29 |
| | |||||
* | No reason to get Channels from connections, that's MCs job | Sjoerd Simons | 2010-02-25 | 1 | -27/+0 |
| | |||||
* | Merge branch 'requests'. Fixes: #598905 | Sjoerd Simons | 2010-02-25 | 5 | -159/+231 |
|\ | |||||
| * | Not using the weak object anymore, get the dispatcher request data from ↵ | Sjoerd Simons | 2010-02-25 | 1 | -3/+3 |
| | | | | | | | | request data | ||||
| * | Use a appropriate unique name for Empathy unique app | Sjoerd Simons | 2010-02-25 | 1 | -2/+0 |
| | | |||||
| * | Assert that the account exists | Sjoerd Simons | 2010-02-25 | 1 | -0/+2 |
| | | |||||
| * | Small coding style fix | Sjoerd Simons | 2010-02-25 | 1 | -1/+2 |
| | | |||||
| * | Set ourselves as the preferred handler if there is a callback | Sjoerd Simons | 2010-02-25 | 1 | -2/+6 |
| | | |||||
| * | If we're asked to handle a channel twice, assume it's due to user action | Sjoerd Simons | 2010-02-25 | 1 | -2/+15 |
| | | |||||
| * | Add a debug message for when errors are signaled | Sjoerd Simons | 2010-02-25 | 1 | -0/+2 |
| | | |||||
| * | Add a convenience function to get the busname of a handler | Sjoerd Simons | 2010-02-25 | 2 | -1/+11 |
| | | |||||
| * | Output the path before trying to register it | Sjoerd Simons | 2010-02-25 | 1 | -1/+1 |
| | | |||||
| * | Replace tabs with spaces | Sjoerd Simons | 2010-02-25 | 1 | -2/+2 |
| | | |||||
| * | Remove dead code related to outstanding channels | Sjoerd Simons | 2010-02-25 | 1 | -96/+2 |
| | | | | | | | | | | | | | | | | With the move to the ChannelDispatcher channels we've requested will either not be dispatched through HandleChannels (because we used the old way of directly requesting it on the MC) or will get passed after we've started the request and can thus be dispatched right away. The concept of oustanding channel is thus obsolete. | ||||
| * | Don't ever drop requested channels | Sjoerd Simons | 2010-02-24 | 1 | -11/+0 |
| | | | | | | | | | | | | | | Before moving to the ChannelDispatcher we got channels either through the NewChannel(s) signal or as a result of requesting a channel from the CM. Now that we've moved to the ChannelDispatcher, we only get channels that we should handle through HandleChannels. So we shouldn't filter any of them. | ||||
| * | Check if channels we requested satisfy requests | Sjoerd Simons | 2010-02-24 | 1 | -18/+51 |
| | | |||||
| * | Request channels from the CD instead of the CM | Sjoerd Simons | 2010-02-24 | 1 | -27/+141 |
| | | |||||
* | | empathy_account_settings_has_account: cope with priv->account being NULL | Guillaume Desmottes | 2010-02-24 | 1 | -0/+3 |
|/ | | | | | priv->account is not garantee to be set so empathy_account_settings_has_account shouldn't assume it is (#610942). | ||||
* | define EMPATHY_CLIENT_NAME | Guillaume Desmottes | 2010-02-22 | 1 | -0/+2 |
| | |||||
* | always use empathy_tp_chat_leave instead of _close | Guillaume Desmottes | 2010-02-20 | 2 | -4/+3 |
| | |||||
* | empathy_tp_chat_leave: try to remove the self-handle instead of closing ↵ | Guillaume Desmottes | 2010-02-19 | 1 | -1/+35 |
| | | | | (#610461) | ||||
* | Introduce empathy_tp_chat_leave | Guillaume Desmottes | 2010-02-19 | 2 | -0/+8 |
| | |||||
* | Use TpDebugSender to publish debug messages (#607330) | Jonny Lamb | 2010-02-17 | 4 | -366/+8 |
| | |||||
* | Merge branch 'ack-all' | Sjoerd Simons | 2010-02-16 | 2 | -0/+8 |
|\ | |||||
| * | add API to TpChat to ack all pending messages in one go | Sjoerd Simons | 2010-02-16 | 2 | -0/+8 |
| | | |||||
* | | dispatcher_connection_new_requested_channel: fix a use-after-free crash | Guillaume Desmottes | 2010-02-16 | 1 | -2/+8 |
|/ | | | | | | | | | If an error occurs when requesting the channel, we call dispatcher_request_failed which as the side effect of destroying the DispatcherRequestData. When calling dispatcher_flush_outstanding_operations we used to deference this pointer. Fixes this crash by using the "self" pointer instead and reffing it to be sure it stays valid. | ||||
* | Separate the accounts dialog into its own program which works with the Gnome ↵ | Travis Reitter | 2010-02-12 | 1 | -1/+6 |
| | | | | | | | | preferences and control center. Where available, this also supports embedding the preferences dialog in the "extensible-shell" control center (currently in development, but likely to be mainlined soon). | ||||
* | Use the 'phone' icon for the 'sms' protocol | Guillaume Desmottes | 2010-02-10 | 1 | -0/+2 |
| | |||||
* | Use the SIP icon for the SIMPLE protocol | Guillaume Desmottes | 2010-02-09 | 1 | -1/+4 |
| | | | | SIMPLE is a SIP extension. | ||||
* | Use a GSList instead of GList to store messages to ack | Guillaume Desmottes | 2010-02-09 | 2 | -7/+7 |
| | |||||
* | Don't assume that removing a user from 'stored' will remove them from all lists | Danielle Madeley | 2010-02-08 | 1 | -2/+0 |
| | | | | | | This doesn't appear to be correct for all CMs (at least, it doesn't appear to be correct for Gabble). At least it doesn't appear incorrect to attempt to remove the contact from the other lists anyway (#608974). | ||||
* | Ensure that the EmpathyIdle is not used in account_manager_ready_cb after ↵ | Travis Reitter | 2010-02-08 | 1 | -3/+16 |
| | | | | | | being finalized Fixes #608813 | ||||
* | notify_ready_cb: use g_simple_async_result_complete instead of _in_idle | Guillaume Desmottes | 2010-01-22 | 1 | -1/+1 |
| | |||||
* | replace empathy_connection_managers_call_when_ready by ↵ | Guillaume Desmottes | 2010-01-22 | 2 | -51/+38 |
| | | | | prepare_{async_finish} functions | ||||
* | add empathy_connection_managers_call_when_ready | Guillaume Desmottes | 2010-01-22 | 2 | -0/+73 |
| | | | | That's easier to use than checking if ready and connecting a callback. | ||||
* | remove empathy-tube-handler.c and empathy-tube-dispatch | Guillaume Desmottes | 2010-01-19 | 4 | -355/+0 |
| | |||||
* | stop dispatching tube channels (#599159) | Guillaume Desmottes | 2010-01-19 | 1 | -1/+0 |
| | | | | Tube applications should use the ChannelDispatcher. | ||||
* | Changed the return string of empathy_presence_get_default_message to ↵ | G.Balaji | 2010-01-18 | 1 | -1/+1 |
| | | | | | | Invisible so that we display Invisible to the user. This fix bug #603472 | ||||
* | Support silent build rules with automake 1.11 | Javier Jardón | 2010-01-18 | 1 | -8/+7 |
| | | | | | | | | | | Support silent build rules, requires at least automake-1.11. Disable by either passing --disable-silent-rules to configure or passing V=1 to make. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364 Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
* | Rephrase the TP_CONNECTION_STATUS_REASON_REQUESTED message to make it ↵ | Guillaume Desmottes | 2010-01-15 | 1 | -1/+1 |
| | | | | clearer (#606510) | ||||
* | No need to get RequestableChannelClasses if ContactCapability is implemented | Guillaume Desmottes | 2010-01-14 | 1 | -15/+23 |
| | | | | We use it only as a fallback if it's not. | ||||
* | factor out channel_classes_to_capabilities | Guillaume Desmottes | 2010-01-14 | 1 | -64/+58 |
| | |||||
* | Use ContactCapabilities to get audio/video caps (#599163) | Guillaume Desmottes | 2010-01-14 | 1 | -1/+16 |
| | |||||
* | Stop using the old Capabilities iface if ContactCapabilities is implemented | Guillaume Desmottes | 2010-01-14 | 1 | -20/+20 |
| | |||||
* | Claim that contacts support stream tube if it's announced in their contact ↵ | Guillaume Desmottes | 2010-01-14 | 1 | -7/+10 |
| | | | | capabilities | ||||
* | Claim that contacts support FT if it's announced in their contact ↵ | Guillaume Desmottes | 2010-01-14 | 1 | -0/+91 |
| | | | | capabilities (#599164) | ||||
* | Don't assume contacts support FT if ContactCapabilities is implemented | Guillaume Desmottes | 2010-01-14 | 1 | -4/+19 |
| | |||||
* | Call xmlCleanupParser() only once when exiting (#600693) | Guillaume Desmottes | 2010-01-13 | 3 | -3/+0 |
| | | | | | | | This function should only be called when exiting the application as it cleans up the memory allocated by the library itself. Thanks to Lennart for pointing this out. | ||||
* | listen for the "account-validity-changed" so new account are added to the ↵ | Guillaume Desmottes | 2010-01-12 | 1 | -0/+35 |
| | | | | dispatcher (#605689) | ||||
* | store status-changed sig handler in a hash table | Guillaume Desmottes | 2010-01-12 | 1 | -0/+24 |
| | |||||
* | factor out connect_account | Guillaume Desmottes | 2010-01-12 | 1 | -7/+14 |
| | |||||
* | empathy_dispatcher_join_muc: assert than connection_data is not NULL | Guillaume Desmottes | 2010-01-12 | 1 | -0/+1 |
| | |||||
* | connect to val-changed signal in contact manager | Felix Kaser | 2010-01-11 | 1 | -0/+17 |
| | | | | | new accounts have to be registered for status-changed signals, that can only be done if the account-validity-changed signal is handled. fixes bug #604628 | ||||
* | hash_job_done: set hash_data->error to NULL when cleaning it | Guillaume Desmottes | 2010-01-07 | 1 | -0/+1 |
| | | | | This avoid to try to clean it at second time in hash_data_free (#606220). | ||||
* | account-settings: use empathy_signal_connect_weak to connect the ready ↵ | Guillaume Desmottes | 2009-12-26 | 1 | -2/+2 |
| | | | | | | | signal on managers If for some reason this signal is fired after the settings has been destroyed, we shouldn't crash. | ||||
* | libempathy/empathy-irc-network-manager.c: Fix typo similiar -> similar | Laurent Bigonville | 2009-12-23 | 1 | -1/+1 |
| | |||||
* | add empathy_account_settings_get_tp_protocol | Guillaume Desmottes | 2009-12-22 | 2 | -0/+11 |
| | |||||
* | Refactor MUC upgrading to be a feature of TpChat->add() | Danielle Madeley | 2009-12-21 | 2 | -13/+97 |
| | | | | | Add a method to be able to tell whether a given TpChat supports you calling add() on it. | ||||
* | Don't destroy the request properties, EmpathyDispatcher now owns them | Danielle Madeley | 2009-12-21 | 1 | -0/+13 |
| | | | | | This is not the same as tp-glib semantics (e.g. tp_..._call_create_channel). Add some docs to EmpathyDispatcher to explain this, for the next person. | ||||
* | tp-call: set debug domain to voip | Guillaume Desmottes | 2009-12-18 | 1 | -1/+1 |
| | |||||
* | add empathy_tp_call_has_initial_video | Guillaume Desmottes | 2009-12-16 | 2 | -0/+24 |
| | |||||
* | empathy_protocol_icon_name: use the Yahoo icon for Yahoo Japan (#604567) | Guillaume Desmottes | 2009-12-15 | 1 | -0/+4 |
| | |||||
* | refactor friendly status reason messages | Felix Kaser | 2009-12-15 | 2 | -0/+38 |
| | | | | the friendly status reason can be asked from empathy-utils | ||||
* | connect the 'group-members-changed' on groups once they are ready | Guillaume Desmottes | 2009-12-11 | 1 | -59/+81 |
| | | | | | | | | | The previous code was racy. If the 'group-members-changed' was fired before the channel was ready, the group didn't exist yet in Empathy and so the contact didn't appear in the group. We fix that by connecting this signal once the group channel is ready and adding current members manually. | ||||
* | Use EnsureChannel to get Stored/Publish/Subscribe channels | Xavier Claessens | 2009-12-11 | 1 | -134/+47 |
| | |||||
* | use tp_asv_new | Guillaume Desmottes | 2009-12-10 | 1 | -15/+5 |
| | |||||
* | tp_contact_list_remove: add FIXME about potential race | Guillaume Desmottes | 2009-12-10 | 1 | -0/+2 |
| | |||||
* | tp_contact_list_remove: remove from the stored list if possible (#604181) | Guillaume Desmottes | 2009-12-09 | 1 | -0/+8 |
| | |||||
* | tp-contact-list: request the 'stored' channel | Guillaume Desmottes | 2009-12-09 | 1 | -1/+66 |
| | |||||
* | Don't highlight scrollback messages (#602288) | Guillaume Desmottes | 2009-12-02 | 1 | -0/+8 |
| | |||||
* | tp-chat: set the flags of the message | Guillaume Desmottes | 2009-12-02 | 1 | -4/+9 |
| | |||||
* | empathy-message: add message flags | Guillaume Desmottes | 2009-12-02 | 2 | -0/+39 |
| | |||||
* | contact_manager_status_changed_cb: ignore disconnected account | Guillaume Desmottes | 2009-11-30 | 1 | -0/+4 |
| | | | | | There is no point to start tracking an account which is about to be removed. Furthemore, this avoid to re-add previoulsy invalidated connections (#603361). | ||||
* | add 'voip' debug domain | Guillaume Desmottes | 2009-11-28 | 2 | -0/+2 |
| | |||||
* | Add Test debug domain | Xavier Claessens | 2009-11-25 | 2 | -0/+2 |
| | |||||
* | empathy_tp_contact_factory_get_from_{id,handle} shouldn't pass the ref of ↵ | Guillaume Desmottes | 2009-11-23 | 1 | -0/+7 |
| | | | | | | | the contact to the cb This match the behaviour of empathy_tp_contact_factory_get_from_{ids,handles} and tp_connection_get_contacts_by_handle. | ||||
* | ft-handler: contact_factory_contact_cb: ref the contact | Guillaume Desmottes | 2009-11-23 | 1 | -1/+1 |
| | | | | | empathy_tp_contact_factory_get_from_handle is not supposed to give a reference to the callback. | ||||
* | tp-contact-factory: document that ↵ | Guillaume Desmottes | 2009-11-23 | 1 | -0/+2 |
| | | | | empathy_tp_contact_factory_get_from_{ids,handles} don't give a ref to the cb | ||||
* | idle: make empathy_idle_get_status static | Guillaume Desmottes | 2009-11-19 | 2 | -19/+18 |
| | | | | | It's not used anymore and other components should use the account manager directly. | ||||
* | tp-chat: copy the rename message | Guillaume Desmottes | 2009-11-19 | 1 | -3/+4 |
| | |||||
* | coding style fixes | Guillaume Desmottes | 2009-11-19 | 1 | -4/+4 |
| | |||||
* | don't mix code and variable declarations | Guillaume Desmottes | 2009-11-19 | 1 | -3/+3 |
| | |||||
* | Handle the case where a user's id changes in a chatroom | Jonathon Jongsma | 2009-11-19 | 2 | -0/+104 |
| | | | | | | | | | | | | | | | | | Telepathy-glib has a enum value for the MembersChanged signal to signify that a user's ID has changed. Previously, empathy was simply interpreting this as if a user with the old name had left the chat and a different user with the new name had entered the chat. This change handles this case more gracefully by updating the contact's id (and name) when this change reason is present One thing that does not yet work with this patch is if you are engaged in a private chat with a person and they change their nick in the middle of the chat. Then the EmpathyContact* that you are chatting with is no longer the EmpathyContact* representing the remote user, so messages won't be delivered properly. When we detect that a user has been 'renamed', we probably need to somehow go through all of the private chats with that person and swap out the old (invalid) EmpathyContact* and replace it with the new one so that the chat can continue without interruption. | ||||
* | tp-chat: no need to connect twice on the ChatStateChanged signal | Guillaume Desmottes | 2009-11-19 | 1 | -4/+0 |
| | |||||
* | remove empathy_idle_{get,set}_flash_state | Guillaume Desmottes | 2009-11-18 | 2 | -49/+0 |
| | |||||
* | We should ensure, not create muc channels | Sjoerd Simons | 2009-11-17 | 1 | -0/+1 |
| | |||||
* | log_store_empathy_search_hit_new: don't unref accounts | Guillaume Desmottes | 2009-11-17 | 1 | -1/+0 |
| | | | | tp_account_manager_get_valid_accounts does *not* ref the accounts (#600800). | ||||
* | add empathy_tp_call_get_connection_manager | Guillaume Desmottes | 2009-11-16 | 2 | -0/+23 |
| | |||||
* | contact.h: remove empathy_contact_hash as it's not defined (#580254) | Guillaume Desmottes | 2009-11-14 | 1 | -1/+0 |
| | |||||
* | Respect indentation style. | Cosimo Cecchi | 2009-11-13 | 2 | -23/+25 |
| | |||||
* | tp-chat: update the 'password-needed' property when password flags changes | Guillaume Desmottes | 2009-11-13 | 1 | -0/+27 |
| | |||||
* | empathy-tp-chat: add 'password-needed' property | Guillaume Desmottes | 2009-11-13 | 1 | -0/+13 |
| | |||||
* | add empathy_tp_chat_provide_password_{async,finish} | Guillaume Desmottes | 2009-11-13 | 2 | -0/+63 |
| | |||||
* | tp_chat_check_if_ready: deal with password protected room | Guillaume Desmottes | 2009-11-13 | 1 | -2/+10 |
| | | | | | | The TpChat is not ready if we are fetching the password flags. But once it's fetched, the chat is ready if it's protected as we won't be able to get the members of the room. | ||||
* | tp-chat: add API to check if a password is required | Guillaume Desmottes | 2009-11-13 | 2 | -0/+38 |
| | |||||
* | tp_chat_check_if_ready: split the test checking if the TpChat is ready | Guillaume Desmottes | 2009-11-13 | 1 | -3/+8 |
| | |||||
* | libempathy/Makefile.am: sort files | Guillaume Desmottes | 2009-11-13 | 1 | -14/+14 |
| | |||||
* | empathy-tp-contact-factory: ensure that ↵ | Guillaume Desmottes | 2009-11-12 | 1 | -1/+18 |
| | | | | empathy_tp_contact_factory_get_from_handle always return an error if the contact hasn't been created | ||||
* | empathy_dispatch_operation_dispose: fix crash when disconnecting the ready ↵ | Guillaume Desmottes | 2009-11-12 | 1 | -5/+3 |
| | | | | | | | signal We were trying to disconnect the wrong signal and it should be disconnected before unrefing channel_wrapper. | ||||
* | Warn if accessing connection status before AM is ready | Danielle Madeley | 2009-11-10 | 1 | -0/+5 |
| | |||||
* | empathy-tp-call: we are not sending or receiving video if the video stream ↵ | Guillaume Desmottes | 2009-11-10 | 1 | -0/+6 |
| | | | | doesn't exist | ||||
* | TpContactFactory: wait that the connection is ready before using it | Guillaume Desmottes | 2009-11-09 | 1 | -13/+35 |
| | |||||
* | dispatcher_init_connection_if_needed: wait that the connection is ready ↵ | Guillaume Desmottes | 2009-11-09 | 1 | -11/+32 |
| | | | | before using it (#600713) | ||||
* | [EmpathyIdle] track whether the AccountManager is ready, warn if it is not | Danielle Madeley | 2009-11-09 | 1 | -0/+16 |
| | |||||
* | empathy_call_handler_request_cb: notify when the tp-call property is set | Guillaume Desmottes | 2009-11-05 | 1 | -0/+1 |
| | |||||
* | TpCall: add {audio,video}-stream-error signals | Guillaume Desmottes | 2009-11-05 | 1 | -0/+58 |
| | |||||
* | empathy-dispatch-operation: ensure that the operation stays alive while ↵ | Guillaume Desmottes | 2009-11-04 | 1 | -2/+12 |
| | | | | tp_channel_call_when_ready is running | ||||
* | empathy-dispatch-operation: ensure that the operation stays alive while ↵ | Guillaume Desmottes | 2009-11-04 | 1 | -0/+12 |
| | | | | tp_connection_call_when_ready is running (#600551) | ||||
* | Merge branch 'irc-command' | Xavier Claessens | 2009-11-04 | 4 | -80/+61 |
|\ | |||||
| * | Move /me and /say support from EmpathyMessage to EmpathyChat. | Xavier Claessens | 2009-11-01 | 2 | -57/+0 |
| | | | | | | | | Also make commands not case sensitive and use g_ascii_isspace to detect spaces. | ||||
| * | Fix topic not always shown, and add /topic command support. | Xavier Claessens | 2009-11-01 | 2 | -23/+61 |
| | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=573407 | ||||
* | | Merge branch 'accountz' | Jonny Lamb | 2009-11-02 | 26 | -2888/+518 |
|\ \ | |/ |/| | |||||
| * | log-store-empathy: refer to "make logs async" bug | Jonny Lamb | 2009-10-30 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | dispatcher: refer to EmpathyHandler bug | Jonny Lamb | 2009-10-30 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: added a comment to explain _is_just_connected | Jonny Lamb | 2009-10-30 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: don't hardcode 10 seconds as the "just connected" time | Jonny Lamb | 2009-10-30 | 1 | -1/+5 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: add comment about the connect_times hash table types | Jonny Lamb | 2009-10-30 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: updated comment | Jonny Lamb | 2009-10-30 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | utils: remove FIXME | Jonny Lamb | 2009-10-30 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Although still true, the comment above the function will suffice and this can't really be changed without lots of making-async of other places in Empathy. I also don't think this is a problem in practice as everywhere in Empathy we use the account manager should have a _prepare called beforehand. Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | all: log error messages if preparing the account manager fails | Jonny Lamb | 2009-10-30 | 5 | -10/+36 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | contact-manager, dispatcher: renamed _new_connection_cb to _status_changed_cb | Jonny Lamb | 2009-10-25 | 2 | -6/+6 |
| | | | | | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=599169#c2 Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: use the TpAccount pointer as key to the hash table, and remove values ↵ | Jonny Lamb | 2009-10-25 | 1 | -12/+8 |
| | | | | | | | | | | | | | | | | on disconnect https://bugzilla.gnome.org/show_bug.cgi?id=599169#c2 Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | tp-roomlist: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -8/+6 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | log-store: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -19/+19 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | log-store-empathy: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 1 | -17/+19 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | log-manager: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -11/+11 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | dispatcher: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 1 | -27/+48 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | contact: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -17/+13 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | contact-manager: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 1 | -22/+46 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | chatroom: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -13/+14 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | chatroom-manager: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -41/+27 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | account-settings: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 2 | -77/+77 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | Add empathy_idle_account_is_just_connected function. | Jonny Lamb | 2009-10-24 | 2 | -0/+70 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | idle: port to new tp-glib account API | Jonny Lamb | 2009-10-24 | 1 | -20/+22 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | Add empathy_account_manager_get_accounts_connected function. | Jonny Lamb | 2009-10-24 | 2 | -0/+36 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | Add empathy_get_account_for_connection function. | Jonny Lamb | 2009-10-24 | 2 | -1/+36 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | Add empathy_idle_get_requested_presence function. | Jonny Lamb | 2009-10-24 | 2 | -12/+44 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| * | Removed EmpathyAccount{,Manager}. | Jonny Lamb | 2009-10-23 | 5 | -2604/+0 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
* | | dispatcher_request_handles_cb: use request_data->dispatcher to get the self ↵ | Guillaume Desmottes | 2009-10-26 | 1 | -1/+1 |
|/ | | | | | | | pointer We don't pass a weak pointer to tp_cli_connection_call_request_handles so we can't rely on it (#599612). | ||||
* | Enable extra error CFLAGS in libempathy/ | Guillaume Desmottes | 2009-10-23 | 1 | -0/+1 |
| | |||||
* | empathy-utils.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -6/+8 |
| | |||||
* | empathy-tp-contact-list.c: fix shadow declaration and uint comparaison | Guillaume Desmottes | 2009-10-22 | 1 | -6/+6 |
| | |||||
* | empathy-tp-contact-factory.c: fix casting issue | Guillaume Desmottes | 2009-10-22 | 1 | -1/+1 |
| | |||||
* | empathy-time.c: fix shadow declaration | Guillaume Desmottes | 2009-10-22 | 1 | -4/+4 |
| | |||||
* | empathy-status-presets.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -10/+10 |
| | |||||
* | empathy-log-store-empathy.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -12/+13 |
| | |||||
* | empathy-irc-network-manager.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -22/+29 |
| | |||||
* | empathy-dispatcher.c: fix shadow declarations | Guillaume Desmottes | 2009-10-22 | 1 | -123/+122 |
| | |||||
* | empathy-contact-groups.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -10/+11 |
| | |||||
* | empathy-connection-managers.c: fix shadow declarations | Guillaume Desmottes | 2009-10-22 | 1 | -14/+14 |
| | |||||
* | empathy-chatroom-manager.c: fix casting issues | Guillaume Desmottes | 2009-10-22 | 1 | -8/+12 |
| | |||||
* | empathy-account-settings.c: fix uint comparaison | Guillaume Desmottes | 2009-10-22 | 1 | -4/+4 |
| | |||||
* | empathy-account-settings: fix CLAMP usage | Guillaume Desmottes | 2009-10-22 | 1 | -7/+9 |
| | | | | | CLAMP syntax is (x, low, high), not (low, x, high). Also add some cast to fix compiler warnings. | ||||
* | empathy-tp-chat.c: fix shadow declaration | Guillaume Desmottes | 2009-10-21 | 1 | -2/+2 |
| | |||||
* | empathy-contact: cast data pointers | Guillaume Desmottes | 2009-10-21 | 1 | -2/+4 |
| | |||||
* | empathy-account-manager.c: fix uint comparaison | Guillaume Desmottes | 2009-10-21 | 1 | -1/+1 |
| | |||||
* | empathy-irc-server: the port is a guint | Guillaume Desmottes | 2009-10-21 | 1 | -1/+1 |
| | |||||
* | Stop building libempathy{,-gtk} as a shared library. Closes bug #599086 | Jonny Lamb | 2009-10-21 | 2 | -70/+46 |
| | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
* | Ensure we don't try to register invalid bus names | Sjoerd Simons | 2009-10-20 | 1 | -5/+6 |
| | |||||
* | Unset pending_call explicitly instead of implicitly | Sjoerd Simons | 2009-10-20 | 1 | -2/+11 |
| | |||||
* | Merge commit 'maiku/bug_598332' | Guillaume Desmottes | 2009-10-19 | 1 | -20/+33 |
|\ | |||||
| * | Move destruction of connections from finalize to dispose. | Mike Ruprecht | 2009-10-15 | 1 | -8/+12 |
| | | | | | | | | | | | | | | Code can potentially be run between the dispose and finalize methods. This moves the destruction of connections and subsequently outstanding_requests into the dispose function so the request callback can't be fired between unreffing the EmpathyDispatcher and cancelling the pending request. | ||||
| * | Remove the weak_object parameter when requesting channels. | Mike Ruprecht | 2009-10-15 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | Use the EmpathyDispatcher pointed to in the DispatcherRequestData instead of the weak_object. Outstanding channel requests were being cancelled in the EmpathyDispatcher's finalize method. This had the potential to double-cancel the requests when the weak_object (EmpathyDispatcher) was unreffed, causing a segmentation fault. | ||||
| * | Cancel outstanding channel requests if connection to the CM is lost. | Mike Ruprecht | 2009-10-14 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | When the connection to a given channel manager was lost (such as it crashed), any outstanding channel requests were freed, but then the request callback fired with an invalid (already freed) DispatcherRequestData parameter. It subsequently used this invalid data and crashed. This patch cancels all outstanding channel requests when they are freed so the callback isn't called with invalid data. Fixes #598332 | ||||
* | | empathy_account_settings_get_tp_params: don't raise an error if tp_protocol ↵ | Guillaume Desmottes | 2009-10-19 | 1 | -1/+9 |
| | | | | | | | | is NULL | ||||
* | | empathy-account-settings: don't cache the TpConnectionManagerProtocol | Guillaume Desmottes | 2009-10-19 | 1 | -6/+12 |
| | | | | | | | | | | | | The result of tp_connection_manager_get_protocol isn't garanteed to be valid after the main loop re-entered. We can't cache it in the account settings and so have to request it each time we need it. | ||||
* | | idle: work around the case if the session doesn't tell us when we go idle ↵ | Jonny Lamb | 2009-10-17 | 1 | -6/+17 |
| | | | | | | | | | | | | (fixes bug #594619) Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
* | | connectivity: small fix to a debug message | Jonny Lamb | 2009-10-17 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
* | | copy empathy_signal_connect_weak from telepathy-gabble | Guillaume Desmottes | 2009-10-15 | 2 | -0/+90 |
|/ | |||||
* | remove empathy_account_manager_remove from header; function has been removed | Guillaume Desmottes | 2009-10-05 | 1 | -3/+0 |
| | |||||
* | remove empathy_tp_contact_list_can_add from header; function has been removed | Guillaume Desmottes | 2009-10-05 | 1 | -1/+0 |
| | |||||
* | Revert "Revert "Remove deprecated call to g_mapped_file_free()"" | Xavier Claessens | 2009-09-24 | 1 | -8/+1 |
| | | | | This reverts commit 0343c43f77ab5e59c614af0c0fa60d518d78a774. | ||||
* | Merge commit 'istaz/handle_none' | Xavier Claessens | 2009-09-21 | 1 | -1/+10 |
|\ | |||||
| * | Fallback to the contact id if present when there is no room id for ↵ | Olivier Le Thanh Duong | 2009-09-21 | 1 | -1/+10 |
| | | | | | | | | empathy_tp_chat | ||||
* | | Set the ice-udp capability directly as well | Sjoerd Simons | 2009-09-20 | 1 | -1/+3 |
| | | |||||
* | | idle: wait for the account manager to be ready before setting initial state | Jonny Lamb | 2009-09-18 | 1 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | Also, if we can get the global presence from the account manager straight away (in _init), then don't bother signalling the change. Otherwise, do signal the initial setting so things like the presence chooser and status icon will be updated with the initial presence. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | | Iterate avatar tokens with a GHashTableIter | Will Thompson | 2009-09-17 | 1 | -30/+19 |
| | | |||||
* | | Get rid of the last two _run_ calls in Empathy | Will Thompson | 2009-09-17 | 1 | -31/+29 |
| | | | | | | | | | | | | | | | | Hooray! Also, don't try to get known avatar tokens or capabilities if the CM doesn't support them. This reduces the outrageous Debug spam when I connect to a Haze account or (worse) a big IRC channel. Fixes Gnome bug #532737 | ||||
* | | Fix indentation of previous patch | Xavier Claessens | 2009-09-16 | 1 | -1/+3 |
| | | |||||
* | | empathy_avatar_new takes ownership of arguments. Do not free filename. | Xavier Claessens | 2009-09-16 | 1 | -2/+2 |
| | | |||||
* | | Only handle manually text channels. | Cosimo Cecchi | 2009-09-16 | 1 | -0/+6 |
| | | |||||
* | | Dispatch existing channels once we initialize the connection. | Cosimo Cecchi | 2009-09-16 | 1 | -0/+21 |
|/ | |||||
* | Fix long lines. | Cosimo Cecchi | 2009-09-15 | 1 | -6/+8 |
| | |||||
* | Always call _ensure_channel for text chats. | Cosimo Cecchi | 2009-09-15 | 1 | -10/+42 |
| | | | | So we can catch opened channels as well, e.g. if we crashed. | ||||
* | Release the busname on disposal. | Cosimo Cecchi | 2009-09-15 | 1 | -4/+31 |
| | |||||
* | Plug some leaks | Cosimo Cecchi | 2009-09-14 | 2 | -0/+5 |
| | |||||
* | Assert that we get a non-null account passed when creating a contact for a log | Sjoerd Simons | 2009-09-14 | 1 | -0/+1 |
| | |||||
* | When getting messages for a file, pass the account as we already know it | Sjoerd Simons | 2009-09-14 | 1 | -14/+4 |
| | |||||
* | Check if the remote-contact is actually there before putting it on the list | Sjoerd Simons | 2009-09-14 | 1 | -1/+2 |
| | |||||
* | dispatcher_request_failed: check if conn_data is not NULL | Guillaume Desmottes | 2009-09-10 | 1 | -2/+7 |
| | | | | | | | | | | Trace attached on lp #392678 seems to indicate that the priv->connections hash table doesn't have a ConnectionData associated with the connection. A possible explanation could be that this connection has been invalidated before the RequestChannel call is terminated. Check if ConnectionData so Empathy won't crash in such case. | ||||
* | empathy_account_settings_get_uint32: check if empathy_account_settings_get ↵ | Guillaume Desmottes | 2009-09-09 | 1 | -0/+2 |
| | | | | returned NULL (#594653) | ||||
* | chatroom-manager: add a ready property | Jonny Lamb | 2009-09-08 | 1 | -0/+18 |
| | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | tp-contact-factory: allow _get_from_handles to call with no handles. | Jonny Lamb | 2009-09-07 | 1 | -0/+5 |
| | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | chatroom-manager: only parse xml file once the account manager is ready | Jonny Lamb | 2009-09-06 | 1 | -1/+31 |
| | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | Add stream-closed signal to EmpathyCallHandler for when a stream is closed | Olivier Crête | 2009-09-02 | 1 | -0/+16 |
| | |||||
* | Fix long lines. | Cosimo Cecchi | 2009-09-01 | 1 | -2/+4 |
| | |||||
* | Be sure that FindChannelRequest has a ref to the Dispatcher | Cosimo Cecchi | 2009-09-01 | 1 | -1/+1 |
| | | | | It has to own a reference, as it will unref when free-ing the struct. | ||||
* | Don't set empty values for the default EmpathyHandler | Cosimo Cecchi | 2009-09-01 | 2 | -0/+14 |
| | | | | | | | | | This implies the following: - have an empty default handler when the Dispatcher is used directly with the singleton - autogenerate the name for the default handler - set priv->filters in the handler to an empty GPtrArray in this case, as that can't be NULL. | ||||
* | Always try to use the Requests interface before calling RequestChannel | Sjoerd Simons | 2009-09-01 | 1 | -10/+43 |
| | |||||
* | Add display name for "gtalk" | Cosimo Cecchi | 2009-08-31 | 1 | -0/+1 |
| | |||||
* | Fix a long line | Cosimo Cecchi | 2009-08-31 | 1 | -1/+2 |
| | |||||
* | Use empathy_protocol_icon_name() | Cosimo Cecchi | 2009-08-31 | 1 | -1/+1 |
| | |||||
* | Fall back to the default icon if an empty icon name is set | Cosimo Cecchi | 2009-08-31 | 1 | -5/+6 |
| | |||||
* | Always set the icon name on account creation. | Cosimo Cecchi | 2009-08-31 | 1 | -5/+2 |
| | |||||
* | Implement setting icon name to the account and to the settings. | Cosimo Cecchi | 2009-08-31 | 4 | -2/+166 |
| | |||||
* | Be consistent with EmpathyMessage style. | Will Thompson | 2009-08-31 | 1 | -8/+16 |
| | |||||
* | Ack received messages from ourself. | Will Thompson | 2009-08-31 | 3 | -2/+44 |
| | | | | | | | | | | Sumana Harihareswara reported that she had started a conversation with herself, sent a message, and then tried to close the window, but whenever she did so it reappeared. This was because Empathy did not acknowledge "incoming" messages from the user themself; hence, when it Close()d the channel, Gabble respawned it, because it still had pending messages. | ||||
* | Handle SendError signal correctly, not as a message | Will Thompson | 2009-08-31 | 1 | -7/+2 |
| | | | | Fixes Gnome bug #593095 - Send errors are printed as normal messages. | ||||
* | Use char* not EmpathyMessage in TpChat:send-error | Will Thompson | 2009-08-31 | 1 | -3/+4 |
| | | | | | | The only consumer of this signal just extracts the body from the EmpathyMessage. It will be easier to handle the SendError D-Bus signal if we don't have to construct an EmpathyMessage from it. | ||||
* | Add functions on the dispatcher to add/remove extra handlers | Sjoerd Simons | 2009-08-31 | 2 | -0/+81 |
| | |||||
* | Add a simple abstraction for implementing handlers | Sjoerd Simons | 2009-08-31 | 5 | -122/+560 |
| | | | | | Implement an EmpathyHandler object which can be used to easily add extra Client.Handler heads on D-Bus. | ||||
* | Merge branch 'do-say-me-think' | Will Thompson | 2009-08-28 | 2 | -15/+59 |
|\ | | | | | | | Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | ||||
| * | Don't parse message in EmpathyMessage:body setter | Will Thompson | 2009-08-28 | 1 | -15/+2 |
| | | | | | | | | | | | | | | | | | | This fixes a bug where the message (Type_Action, "/me wooo yay") is printed as " ! wjt woo yay" rather than as " ! wjt /me woo yay". This also fixes Gnome bug #593101 (Empathy exits sending empty /me message), which was caused by this deleted code walking off the end of the string "/me". | ||||
| * | Add empathy_message_new_from_entry() | Will Thompson | 2009-08-28 | 2 | -0/+57 |
| | | | | | | | | | | | | This will be the sole place that user input is parsed for special commands like /me; the parsing logic will be removed from EmpathyMessage and chat_send(). | ||||
* | | Only unref the AccountManager if it's not NULL | Cosimo Cecchi | 2009-08-28 | 1 | -1/+3 |
|/ | |||||
* | When not connected don't apply !offline states but save them | Sjoerd Simons | 2009-08-28 | 1 | -5/+7 |
| | | | | | | When we're not connected to a network don't allow setting the status to anything else then offline, but when a status is set do save it so it can be applied as soon as soon as we get network connectivity | ||||
* | ->connected always has the right status, so use that instead of specialcasing | Sjoerd Simons | 2009-08-28 | 1 | -8/+1 |
| | |||||
* | Only assume connected when we have neither Connman or NM | Sjoerd Simons | 2009-08-28 | 1 | -1/+1 |
| | |||||
* | Slightly improve debug info | Sjoerd Simons | 2009-08-28 | 1 | -1/+2 |
| | |||||
* | Merge commit 'jtellier/reconnect-account' | Guillaume Desmottes | 2009-08-27 | 2 | -0/+50 |
|\ | |||||
| * | - Added a utility function (empathy_account_reconnect_async) to easily | Jonathan Tellier | 2009-08-26 | 2 | -0/+50 |
| | | | | | | | | | | | | | | reconnect an account. - When we apply changes to an account, instead of disconnecting and reconnecting it, we use the new empathy_account_reconnect_async function. | ||||
* | | Remove libmissioncontrol deps | Pierre-Luc Beaudoin | 2009-08-27 | 1 | -2/+2 |
| | | | | | | | | and remove trailing spaces | ||||
* | | Only request presence when the account is enabled (#593161). | Cosimo Cecchi | 2009-08-27 | 1 | -9/+12 |
| | | |||||
* | | Ensure all accounts when getting all properties | Cosimo Cecchi | 2009-08-26 | 1 | -9/+71 |
| | | | | | | | | | | | | This introduces a check on the number of accounts, as MC5 could come back advertising less accounts than we have. In that case, we find the one which have gone and remove them from our cache. | ||||
* | | Implement empathy_account_refresh_properties() | Cosimo Cecchi | 2009-08-26 | 2 | -7/+20 |
| | | |||||
* | | Fix long lines. | Cosimo Cecchi | 2009-08-26 | 1 | -4/+5 |
| | | |||||
* | | Restart MC5 when it quits or crashes (#593018). | Cosimo Cecchi | 2009-08-26 | 1 | -28/+47 |
|/ | |||||
* | Request presence again when an account is enabled | Cosimo Cecchi | 2009-08-26 | 1 | -0/+17 |
| | |||||
* | Fix alignment | Xavier Claessens | 2009-08-25 | 1 | -1/+1 |
| | |||||
* | Add human-readable names for Yahoo! Japan and Facebook Chat | Will Thompson | 2009-08-25 | 1 | -0/+2 |
| | | | | | | These are both marked for translation. Obviously the first should be localized in its target market, and the latter probably wants translating too (perhaps "Clavardage de Facebook"?). | ||||
* | Call gettext for translated protocol names | Will Thompson | 2009-08-25 | 1 | -10/+16 |
| | |||||
* | Wait for the connection to be ready before requesting contacts from it. | Jonny Lamb | 2009-08-25 | 1 | -6/+22 |
| | | | | Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | Make empathy_protocol_name_to_display_name public | Cosimo Cecchi | 2009-08-25 | 2 | -0/+31 |
| | |||||
* | Fix a crash caused by tp-glib emitting invalidated in dispose | Sjoerd Simons | 2009-08-25 | 1 | -20/+11 |
| | | | | | | | When an TpProxy is disposed tp-glib emits the invalidated signal. This meant that when EmpathyAccount disposed its TpConnection as a result of the account manager saying the connection was gone, the invalidated signal was emitted. As a result of which the TpConnection would get disposed again... | ||||
* | Fallback to setting the global presence to offline if no account has a ↵ | Jonny Lamb | 2009-08-25 | 1 | -0/+1 |
| | | | | | | better presence. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> | ||||
* | Free the allocated dirname after usage | Sjoerd Simons | 2009-08-24 | 1 | -0/+2 |
| | |||||
* | Fix several coding style issues | Sjoerd Simons | 2009-08-24 | 1 | -1/+1 |
| | |||||
* | Don't use a custom function to build the log dir | Sjoerd Simons | 2009-08-24 | 1 | -2/+1 |
| | |||||
* | Have log_store_empathy_search_hit_new lookup accounts properly | Sjoerd Simons | 2009-08-24 | 1 | -7/+17 |
| | |||||
* | Split out the account name to dirname translation | Sjoerd Simons | 2009-08-24 | 1 | -6/+14 |
| | |||||
* | Ensure that the connection data is setup when handle channels | Sjoerd Simons | 2009-08-24 | 1 | -3/+16 |
| | |||||
* | Add a new _ensure_account API | Sjoerd Simons | 2009-08-24 | 3 | -4/+17 |
| | | | | | Have one call which only gets the account if it exists and a different one which creates the account on the given path when needed. | ||||
* | Make the dir names for the logs look nicer | Sjoerd Simons | 2009-08-24 | 1 | -4/+6 |
| | |||||
* | Don't override the display_name when creating the account | Sjoerd Simons | 2009-08-24 | 1 | -6/+0 |
| | |||||
* | Return the correct object when querying the dbus-daemon property | Sjoerd Simons | 2009-08-24 | 1 | -2/+1 |
| | |||||
* | Remove unused finalize | Sjoerd Simons | 2009-08-24 | 1 | -16/+0 |
| | |||||
* | Add a new DEBUG domain for the mc4 account importer | Arnaud Maillet | 2009-08-24 | 2 | -0/+2 |
| | |||||
* | Use better avatar location: ~/.cache/<cm>/<protocol>/<token> | Xavier Claessens | 2009-08-24 | 1 | -7/+3 |
| | |||||
* | Fix some leaks in _settings_discard | Sjoerd Simons | 2009-08-23 | 1 | -13/+13 |
| | | | | | Prevent leaking the unset parameter names when unsetting the array. Also use it as a general utility function in other parts of the code | ||||
* | If the parameter wasn't known return NULL for the dbus signature | Sjoerd Simons | 2009-08-23 | 1 | -0/+3 |
| |