aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New upstream snapshotdebian/2.34.0+git.20110701.a51242-0ubuntu0+easton1Emilio Pozuelo Monfort2011-07-021-0/+6
|
* Merge branch 'ppa-bug-fixes' into debianEmilio Pozuelo Monfort2011-07-024-11/+269
|\
| * Add a dialpad to the New conversation and New call dialogsEmilio Pozuelo Monfort2011-06-302-4/+110
| | | | | | | | | | | | | | Since one can start a call or send an SMS to a phone number. Also change 'Contact ID:' to 'To:' to reflect that not only contact ids are accepted.
| * Autocomplete contacts when blocking by aliasEmilio Pozuelo Monfort2011-06-301-2/+81
| | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=653650
| * LogWindow: keep the selected dates when changing Who or WhatEmilio Pozuelo Monfort2011-06-291-5/+78
| | | | | | | | | | | | | | | | | | | | If the same dates are present for the new selection. https://bugzilla.gnome.org/show_bug.cgi?id=653635 Conflicts: libempathy-gtk/empathy-log-window.c
* | New upstream snapshotdebian/2.34.0+git.20110617.860450-0ubuntu0+easton1Emilio Pozuelo Monfort2011-06-171-0/+6
| |
* | Merge branch 'ppa-bug-fixes' into debianEmilio Pozuelo Monfort2011-06-172-2/+13
|\|
| * Hide the password entry for Skype accounts in the assistantEmilio Pozuelo Monfort2011-06-172-2/+13
| | | | | | | | | | | | | | | | | | | | As it wasn't working and it's quite complex to make it work. Empathy will ask for the password in an infobar when the user creates it, which was already happening anyway. Conflicts: libempathy-gtk/empathy-account-widget-skype.c
* | New upstream snapshotdebian/2.34.0+git.20110610.0f7b30-0ubuntu0+easton1Emilio Pozuelo Monfort2011-06-101-0/+6
| |
* | Merge branch 'ppa-bug-fixes' into debianEmilio Pozuelo Monfort2011-06-103-8/+24
|\|
| * Don't unref NULL pointersEmilio Pozuelo Monfort2011-06-101-1/+1
| | | | | | | | | | | | log_window_got_messages_for_date_cb() can return NULL for unknown event types, so don't unref the result in those cases.
| * empathy_contact_from_tpl_contact: check the accounts matchEmilio Pozuelo Monfort2011-06-101-6/+22
| | | | | | | | | | | | | | | | | | Two contacts may not be the same if only their ids match, so also check the accounts. This was causing us to return the same contact from another account, which would cause "is-user" to not be properly set, confusing the log viewer.
| * Check we actually have a part #1 before requesting itDanielle Madeley2011-06-101-1/+1
| | | | | | | | | | We were checking echo->len >= 1, but then requesting index 1 (the second part). So if we didn't have a second part, this would quite happily blow up.
* | Bump minimum webkit versiondebian/2.34.0+git.20110606.77d952-0ubuntu0+easton1Emilio Pozuelo Monfort2011-06-072-1/+2
| |
* | New upstream snapshotEmilio Pozuelo Monfort2011-06-071-0/+6
| |
* | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-06-073-56/+24
|\|
| * Merge branch 'search-columns-193' into empathy-skypeDanielle Madeley2011-06-031-8/+15
| |\
| | * Use some markup to make the logs more readableDanielle Madeley2011-05-271-5/+7
| | | | | | | | | | | | | | | Emotes are in italics. Sender's names are in bold. Mark emotes for translation since we've done that for messages.
| | * Don't allow interactive searching on the log paneDanielle Madeley2011-05-271-0/+2
| | |
| | * Remove unrequired COL_WHAT_EXPANDERDanielle Madeley2011-05-271-3/+1
| | |
| | * [log-viewer] set search columnsDanielle Madeley2011-05-271-0/+5
| | |
| * | Remove AllowVideoFrom settingEmilio Pozuelo Monfort2011-06-012-48/+9
| |/
* | Bump minimum logger versiondebian/2.34.0+git.20110531.338a6e-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-312-1/+2
| |
* | Patches refreshedEmilio Pozuelo Monfort2011-05-315-27/+28
| |
* | New upstream snapshotEmilio Pozuelo Monfort2011-05-311-0/+6
| |
* | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-319-25/+332
|\|
| * Merge branch 'message-editing-48-more' into empathy-skypeDanielle Madeley2011-05-279-25/+332
| |\
| | * Bump to released TPL version 0.2.10Danielle Madeley2011-05-271-1/+1
| | |
| | * Update for new TPL API, we now get timestamp and edit_timestampDanielle Madeley2011-05-271-3/+21
| | | | | | | | | | | | | | | This makes it backwards to what we get in Telepathy, but we can manage by translating it into the Telepathy form.
| | * Reset the chat state after receiving an edited messageDanielle Madeley2011-05-261-12/+9
| | |
| | * Replace tpl_text_event_dup_supersedes() with synthetic messageDanielle Madeley2011-05-261-18/+24
| | | | | | | | | | | | | | | This allows us to handle the case where we get b-supersedes-a, but we've lost the original message a.
| | * Add 'original-timestamp' to EmpathyMessageDanielle Madeley2011-05-262-3/+36
| | |
| | * Set the edited icon for edited messages in the log viewerDanielle Madeley2011-05-251-0/+7
| | |
| | * Get the original message from the logger so we can supersede itDanielle Madeley2011-05-252-2/+23
| | | | | | | | | | | | | | | | | | | | | Strictly, we don't need to do this, we could just use the supersedes-token as the message-token and we'd still be able to edit the messages in the future, but this way we get the nice pretty annotation saying that we edited it and when.
| | * Set 'token' and 'supersedes' for events from the loggerDanielle Madeley2011-05-252-5/+8
| | |
| | * Add an icon to edited messagesDanielle Madeley2011-05-252-0/+30
| | | | | | | | | | | | | | | | | | | | | Currently this is using "format-text-direction-ltr" which is a crappy choice. We should ask for a better icon. Also, this should really be implemented as a class, so that the icon can change with the theme. Or be made part of the Adium theme, or something. Basically this is kludgey.
| | * Add a tooltip saying when the message was editedDanielle Madeley2011-05-251-0/+14
| | |
| | * [theme-adium] implement edit_message()Danielle Madeley2011-05-252-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done via DOM manipulation, we find the id for the <span> tag we wrapped the message in in the previous commit. We then replace the innerHTML with the new message. This requires a version of WebKitGtk 1.3.x, but I'm not precisely sure what. I used WebKitGtk 1.4.0, but natty only has 1.3.13, so we'll try setting that as the dep. Need to somehow mark a message as edited. Could set a class on it, but that requires support in the theme. Need inspiration here.
| | * [theme-adium] wrap the messages in <span id=...> so we can find them againDanielle Madeley2011-05-251-4/+16
| | | | | | | | | | | | This will enable our DOM manipulation
| | * Pass edited messages through to the ChatViewDanielle Madeley2011-05-201-12/+25
| | |
| | * Add edit_message() method to ChatView ifaceDanielle Madeley2011-05-202-0/+16
| | |
| | * Add 'supersedes' property to EmpathyMessageDanielle Madeley2011-05-202-0/+44
| | | | | | | | | | | | | | | | | | It would be nice to remove EmpathyMessage, because now that TpMessages are a GObject, EmpathyMessage is just an empty abstraction layer that we have to keep punching through.
| | * Add 'token' property to EmpathyMessageDanielle Madeley2011-05-182-0/+31
| | | | | | | | | | | | | | | This allows us to pass the 'message-token' from the TpMessage through to the chat-view.
* | | New upstream snapshotdebian/2.34.0+git.20110526.adcea1-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-271-0/+6
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-2711-72/+220
|\| |
| * | Clear audio_output when the call endsEmilio Pozuelo Monfort2011-05-271-0/+5
| | | | | | | | | | | | So we create a new one when redialing instead of reusing it.
| * | Update telepathy-yell submoduleEmilio Pozuelo Monfort2011-05-271-0/+0
| | |
| * | Reopen tabs as SMS channels when appropriateEmilio Pozuelo Monfort2011-05-261-0/+6
| | |
| * | Set a parent for the error dialogEmilio Pozuelo Monfort2011-05-261-5/+7
| | |
| * | NewMessageDialog: show an error if starting the channel failsEmilio Pozuelo Monfort2011-05-261-2/+77
| | |
| * | empathy_dispatcher_chat_with_contact_id(): add optional cbEmilio Pozuelo Monfort2011-05-268-23/+40
| | |
| * | Remove the balance action when an account is removedDanielle Madeley2011-05-261-38/+48
| | |
| * | Merge branch 'gnome-2-34' into empathy-skypeDanielle Madeley2011-05-261-0/+5
| |\ \
| | * | empathy_chat_window_present_chat: always show newly created windowsGuillaume Desmottes2011-05-261-0/+5
| | | | | | | | | | | | | | | | We just create so we should at least show it.
| * | | CallWindow: show 'On hold' in the statusbar when appropriateEmilio Pozuelo Monfort2011-05-231-3/+38
| | | |
| * | | Directly call the callback if we're readyEmilio Pozuelo Monfort2011-05-231-8/+1
| | | | | | | | | | | | | | | | Instead of duplicating the code in two places.
* | | | New upstream snapshotdebian/2.34.0+git.20110520.5773ec-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-211-0/+6
| | | |
* | | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-2117-131/+242
|\| | |
| * | | Use the official Skype iconEmilio Pozuelo Monfort2011-05-216-36/+34
| | | |
| * | | Merge branch 'sms-topup-154-2' into empathy-skypeEmilio Pozuelo Monfort2011-05-204-1/+90
| |\ \ \
| | * | | EmpathyChat: add a 'Top up' link when there's not enough creditEmilio Pozuelo Monfort2011-05-181-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | This is only added for Adium themes since ChatTextView ones don't support markup.
| | * | | EmpathyThemeAdium: implement append_event_markupEmilio Pozuelo Monfort2011-05-181-0/+9
| | | | |
| | * | | Add empathy_chat_view_append_event_markupEmilio Pozuelo Monfort2011-05-182-0/+22
| | | | |
| * | | | Disable textview themesEmilio Pozuelo Monfort2011-05-191-2/+2
| | | | |
| * | | | log_window_chats_set_selected: only act on normal rowsEmilio Pozuelo Monfort2011-05-181-0/+5
| | |_|/ | |/| |
| * | | Merge branch 'alias-upstream-166' into empathy-skypeDanielle Madeley2011-05-181-5/+65
| |\ \ \ | | |/ / | |/| |
| | * | Update our local fields having Overwritten_By_Nickname when updating our ↵Guillaume Desmottes2011-05-181-0/+43
| | | | | | | | | | | | | | | | nickname (#644298)
| | * | Import get_spec_from_list() from masterDanielle Madeley2011-05-181-0/+17
| | | |
| | * | don't update Alias.Nickname if not neededGuillaume Desmottes2011-05-161-2/+9
| | | |
| | * | inline set_alias_on_account()Guillaume Desmottes2011-05-161-10/+3
| | | |
| * | | Merge branch 'redial-169-2' into empathy-skypeEmilio Pozuelo Monfort2011-05-173-86/+35
| |\ \ \
| | * | | Implement empathy_call_handler_start_call() for redialingEmilio Pozuelo Monfort2011-05-161-12/+18
| | | | |
| | * | | CallHandler: move on_call_accepted_cb() aroundEmilio Pozuelo Monfort2011-05-161-15/+15
| | | | |
| | * | | CallHandler: emit signal with the correct parametersEmilio Pozuelo Monfort2011-05-161-1/+2
| | | | |
| | * | | Remove empathy_call_factory_new_call_with_streamsEmilio Pozuelo Monfort2011-05-162-58/+0
| | |/ / | | | | | | | | | | | | It's unused and empathy_call_new_with_streams is better.
| * / / Don't reset the alias when using empathy_contact_from_tpl_contactEmilio Pozuelo Monfort2011-05-171-1/+11
| |/ / | | | | | | | | | | | | | | | | | | contact_set_property() calls empathy_contact_set_alias(), which tries to set the alias on the FolksPersona, but we don't want to do that when creating an EmpathyContact from a TplEntity. So just set priv->alias instead of passing it to g_object_new() instead.
* | | Update snapshotdebian/2.34.0+git.20110513.8e3f9e-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-131-1/+1
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-132-17/+11
|\| |
| * | Only follow available cameras if the contact can do Video callsEmilio Pozuelo Monfort2011-05-132-17/+11
| | |
* | | Build with gudev support for camera detectionEmilio Pozuelo Monfort2011-05-133-1/+3
| | |
* | | New upstream snapshotEmilio Pozuelo Monfort2011-05-131-0/+6
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-1319-141/+1041
|\| |
| * | Merge branch 'dialpad-163' into empathy-skypeDanielle Madeley2011-05-134-98/+86
| |\ \
| | * | Add letters underneath the numbers on the dialpadDanielle Madeley2011-05-131-13/+39
| | | |
| | * | Factor out dialpad into a utility functionDanielle Madeley2011-05-134-98/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The dialpad is shared between empathy-call and empathy-av. Really it would be nice to make the dialpad its own little widget that emits signals with DTMF event ids, but I've got things to get done.
| * | | LogWindow: disable Video calls if no camera connectedEmilio Pozuelo Monfort2011-05-131-1/+18
| | | |
| * | | CallWindow: disable Video functionality if there's no cameraEmilio Pozuelo Monfort2011-05-131-1/+23
| | | |
| * | | Bind 'Video call' menu items to available camerasEmilio Pozuelo Monfort2011-05-131-0/+7
| | | |
| * | | A contact doesn't support video if we have no cameraEmilio Pozuelo Monfort2011-05-131-2/+13
| | | |
| * | | NewCallDialog: make 'Enable video' unsensitive when there's no cameraEmilio Pozuelo Monfort2011-05-131-0/+19
| | | |
| * | | Add empathy_camera_monitor_get_availableEmilio Pozuelo Monfort2011-05-132-0/+9
| | | |
| * | | Optionally check for gudev for camera monitoringEmilio Pozuelo Monfort2011-05-132-1/+29
| | | |
| * | | Don't disable video calls when built without udevEmilio Pozuelo Monfort2011-05-131-0/+5
| | | |
| * | | Add EmpathyCameraMonitorEmilio Pozuelo Monfort2011-05-133-2/+232
| | | |
| * | | Add CheeseCameraDeviceMonitor from libcheeseEmilio Pozuelo Monfort2011-05-123-3/+485
| |/ /
| * | Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skypeEmilio Pozuelo Monfort2011-05-116-7/+9
| |\| | | | | | | | | | | | | Conflicts: libempathy/empathy-contact.c
| | * contact: fix typo when creating new contact from logger entityJonny Lamb2011-05-111-2/+2
| | | | | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
| | * Include gi18n-lib.h in library sources, not gi18n.h.Gabor Kelemen2011-05-055-5/+7
| | | | | | | | | | | | Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=649379
| * | Use a weak ref to remove the tpcontact from the hashtableEmilio Pozuelo Monfort2011-05-101-11/+14
| | |
| * | LogWindow: Don't cut the log messagesEmilio Pozuelo Monfort2011-05-101-1/+0
| | |
| * | LogWindow: better logic for the buttons sensitivityEmilio Pozuelo Monfort2011-05-101-12/+55
| | |
| * | empathy_contact_from_tpl_contact: set the TpContactEmilio Pozuelo Monfort2011-05-101-15/+50
| | | | | | | | | | | | | | | | | | If available, so we get extra info like capabilities. Based on a patch from Nicolas Dufresne.
* | | New upstream snapshotdebian/2.34.0+git.20110506.376bd2-0ubuntu0+easton1Emilio Pozuelo Monfort2011-05-061-0/+6
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-066-75/+47
|\| |
| * | Include SMSChannel property in empathy_chat_window_find_chat()Danielle Madeley2011-05-053-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The approach in https://bugzilla.gnome.org/show_bug.cgi?id=644085 was wrong because channel paths can change across reconnects. This would cause new chat windows to be created when they were rerequested. A more future-proof solution would be to keep a white/black list of comparable properties, but I think this is overengineering the problem for the time being. Instead we'll just include the SMSChannel property in the comparison.
| * | Revert "[ChatroomManager] find windows by channel path, not by TargetID"Danielle Madeley2011-05-055-52/+6
| | | | | | | | | | | | This reverts commit 0b213f4fae18f24fd7b162ca19c63249cd360e43.
| * | Revert "Make empathy_chat_window_find_chat() static"Danielle Madeley2011-05-052-3/+3
| | | | | | | | | | | | This reverts commit e84d41efe4b2febb9f3276e54f603550c929a69d.
| * | Always call additional_apply_async() so that the password is fed to the observerDanielle Madeley2011-05-051-7/+15
| | |
| * | Merge branch 'tooltip-143' into empathy-skypeDanielle Madeley2011-05-052-10/+16
| |\ \
| | * | Add a tooltip to the sending message spinnerDanielle Madeley2011-05-041-6/+11
| | | |
| | * | Fix broken logic that caused delivery report spinner to spin foreverDanielle Madeley2011-05-041-4/+5
| | | |
* | | | New upstream snapshotEmilio Pozuelo Monfort2011-05-041-0/+6
| | | |
* | | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-05-0414-101/+272
|\| | |
| * | | Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skypeEmilio Pozuelo Monfort2011-05-041-5/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * Correct the interface names used in Empathy.Call.clientSjoerd Simons2011-05-041-5/+5
| | |
| * | Merge branch 'balance-ui-updates' into empathy-skypeDanielle Madeley2011-05-042-21/+38
| |\ \
| | * | Change the menu to say "Credit Balance"Danielle Madeley2011-05-031-1/+1
| | | |
| | * | Update balance view in roster per feedbackDanielle Madeley2011-05-031-14/+25
| | | |
| | * | Change menu string to "Top up Skype ($1.23)..."Danielle Madeley2011-05-031-8/+14
| | | |
| * | | Merge remote-tracking branch 'public/gnome-2-34' into empathy-skypeSjoerd Simons2011-05-041-23/+15
| |\ \ \ | | | |/ | | |/|
| | * | Keep a persistent source video tee aroundSjoerd Simons2011-05-041-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always keep the video input tee around, so we can easily hook up new video contents even if the camera isn't currently enabled. This fixes issues where a new content is added without the local camera being enabled.
| * | | LogWindow: don't crash if closed while retrieving logsEmilio Pozuelo Monfort2011-05-031-1/+4
| | | |
| * | | Show an spinner while logs are being retrievedEmilio Pozuelo Monfort2011-05-032-4/+103
| | | |
| * | | LogWindow: scroll the events view to the endEmilio Pozuelo Monfort2011-05-031-0/+17
| | | | | | | | | | | | | | | | Where newest messages are.
| * | | LogWindow: select the first normal date by defaultEmilio Pozuelo Monfort2011-05-031-2/+3
| | | |
| * | | LogWindow: set 'All accounts' by defaultEmilio Pozuelo Monfort2011-05-031-0/+1
| | | |
| * | | Add empathy_account_chooser_set_allEmilio Pozuelo Monfort2011-05-032-0/+25
| | |/ | |/|
| * | Merge branch 'gnome-2-34' into empathy-skypeEmilio Pozuelo Monfort2011-05-027-43/+56
| |\|
| | * Bug 646227 — Possible overflow in persona-view:drag_data_getPhilip Withnall2011-05-023-40/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think it was a fluke that this code worked in the first place, since it was accessing arrays with indices which were out of range, and which wouldn't have corresponded to the correct entries even if they were in range. This should fix the mapping between DND types and DND URIs/atoms in the contact list, individual and persona views. Closes: bgo#646227
| | * individual_store_get_individual_status_icon_with_icon_name: look in the ↵Guillaume Desmottes2011-05-021-1/+6
| | | | | | | | | | | | cache before creating new pixbuf
| | * main_window_flash_foreach: don't leak the pixbuf returned by ↵Guillaume Desmottes2011-05-021-0/+3
| | | | | | | | | | | | empathy_pixbuf_from_icon_name
| | * set a not empty string when setting ↵Guillaume Desmottes2011-05-022-2/+4
| | | | | | | | | | | | | | | | | | EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND libnotify now filters out empty string so the hint was not set (#648842).
| * | Don't free an uninitialized variableEmilio Pozuelo Monfort2011-05-021-2/+5
| | |
* | | New upstream snapshotEmilio Pozuelo Monfort2011-05-041-0/+6
| | |
* | | Refresh patchesdebian/2.34.0+git.20110429.1c68ea-0ubuntu0+easton1Emilio Pozuelo Monfort2011-04-297-31/+33
| | |
* | | New upstream snapshotEmilio Pozuelo Monfort2011-04-291-0/+6
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-04-2913-71/+413
|\| |
| * | Show an infobar if there's not enough creditEmilio Pozuelo Monfort2011-04-292-8/+118
| | | | | | | | | | | | With a button to buy some if desired.
| * | Generate closures for empathy-callEmilio Pozuelo Monfort2011-04-291-1/+1
| | |
| * | Merge branch 'double-eula-121' into empathy-skypeDanielle Madeley2011-04-293-28/+52
| |\ \
| | * | Update .gitignoreDanielle Madeley2011-04-291-0/+1
| | | |
| | * | Don't show the EULA twiceDanielle Madeley2011-04-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Previously the 'changed' signal was being connected multiple times, the more times it was connected, the more EULAs we would get. Disconnect any existing signals before reconnecting it.
| | * | Don't tie auth observer lifetime to widget lifetimeDanielle Madeley2011-04-281-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | When logging in, the auth observer needs the password after the widget has been destroyed. So instead the auth observer now lives forever, and the password is supplied in account_widget_skype_additional_apply_async()
| * | | Merge branch 'delivery-reports-52' into empathy-skypeDanielle Madeley2011-04-285-28/+204
| |\ \ \
| | * | | [chat-window] add a spinner to the window tab for when messages are being sentDanielle Madeley2011-04-281-0/+34
| | | | |
| | * | | [chat] expose this property in EmpathyChatDanielle Madeley2011-04-282-0/+46
| | | | |
| | * | | [tp-chat] add a counter for the number of pending messagesDanielle Madeley2011-04-282-3/+85
| | | | | | | | | | | | | | | | | | | | Requires delivery reports to include delivery-token.
| | * | | Use dbus-error from delivery report for better errorsDanielle Madeley2011-04-282-25/+39
| | | | |
| * | | | Merge branch 'fix-33-properly' into empathy-skypeDanielle Madeley2011-04-282-5/+22
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Only disable other accounts if we're creating an accountDanielle Madeley2011-04-281-4/+8
| | | | |
| | * | | Set the parent and check the return value correctlyDanielle Madeley2011-04-281-1/+10
| | | | | | | | | | | | | | | | | | | | The parent is currently unused, but it's nice to set it correctly anyway.
| | * | | Fix logic error introduced in ad4626ebDanielle Madeley2011-04-281-4/+8
| | |/ /
| * | | Ensure tp-logger was compiled with Call supportDanielle Madeley2011-04-281-0/+15
| | | |
| * | | tp-logger 0.2.8 is required for Call supportDanielle Madeley2011-04-281-1/+1
| |/ /
* | | New upstream snapshotEmilio Pozuelo Monfort2011-04-283-17/+7
| | |
* | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-04-2815-1567/+3122
|\| |
| * | empathy_message_new is gone, use g_object_newEmilio Pozuelo Monfort2011-04-281-15/+12
| | |
| * | Merge remote-tracking branch 'pochu-public/log-window-619866' into empathy-skypeEmilio Pozuelo Monfort2011-04-2811-1530/+2975
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: libempathy-gtk/empathy-log-window.c libempathy/empathy-message.c
| | * | Display date and time in the event treeviewEmilio Pozuelo Monfort2011-04-271-3/+6
| | | |
| | * | Make the three panes a bit taller by defaultEmilio Pozuelo Monfort2011-04-271-0/+1
| | | |
| | * | Add a clear icon to the search entryEmilio Pozuelo Monfort2011-04-271-0/+23
| | | |
| | * | Don't use global variablesEmilio Pozuelo Monfort2011-04-271-12/+13
| | | |
| | * | Fix buttons to work again with multiselectionEmilio Pozuelo Monfort2011-04-271-35/+48
| | | |
| | * | Use a define instead of hardcoding a magic numberEmilio Pozuelo Monfort2011-04-271-2/+4
| | | |
| | * | Use a for instead of a do while to avoid returning earlyEmilio Pozuelo Monfort2011-04-271-5/+4
| | | | | | | | | | | | | | | | So we always free the stuff at the end of the function.
| | * | Don't leak the account and entityEmilio Pozuelo Monfort2011-04-271-3/+6
| | | |
| | * | Don't leak pathsEmilio Pozuelo Monfort2011-04-271-0/+1
| | | |
| | * | Compare against NULLEmilio Pozuelo Monfort2011-04-271-2/+2
| | | |
| | * | Be neutralEmilio Pozuelo Monfort2011-04-271-1/+1
| | | |
| | * | Style: use braces consistentlyEmilio Pozuelo Monfort2011-04-271-11/+31
| | | |
| | * | Return early if the iter isn't a top levelEmilio Pozuelo Monfort2011-04-271-6/+7
| | | |
| | * | Use a macro for magic numbersEmilio Pozuelo Monfort2011-04-271-1/+4
| | | |
| | * | Don't leak the account and entityEmilio Pozuelo Monfort2011-04-271-6/+9
| | | |
| | * | Use tp_clear_pointerEmilio Pozuelo Monfort2011-04-271-2/+1
| | | |
| | * | LogWindow: group MUC events properlyEmilio Pozuelo Monfort2011-04-271-1/+30
| | | |
| | * | LogWindow: check the 30min gap with the last messageEmilio Pozuelo Monfort2011-04-271-2/+8
| | | |
| | * | LogWindow: find the corrent parent for chat eventsEmilio Pozuelo Monfort2011-04-271-1/+6
| | | |
| | * | LogWindow: Display /me messages properlyEmilio Pozuelo Monfort2011-04-271-4/+14
| | | |
| | * | make check fixesEmilio Pozuelo Monfort2011-04-273-2/+3
| | | |
| | * | Remove more dead codeEmilio Pozuelo Monfort2011-04-271-6/+0
| | | |
| | * | Use a do while instead of a for loop where appropriateEmilio Pozuelo Monfort2011-04-261-2/+2
| | | |
| | * | Remove dead codeEmilio Pozuelo Monfort2011-04-261-3/+0
| | | |
| | * | Fix commentEmilio Pozuelo Monfort2011-04-261-3/+2
| | | |
| | * | Remove stray print statementsEmilio Pozuelo Monfort2011-04-261-6/+4
| | | |
| | * | Remove dead codeEmilio Pozuelo Monfort2011-04-261-30/+0
| | | |
| | * | LogWindow: don't add duplicate datesEmilio Pozuelo Monfort2011-04-261-11/+15
| | | |
| | * | LogWindow: add 'Anyone' to search resultsEmilio Pozuelo Monfort2011-04-261-3/+1
| | | |
| | * | LogWindow: select 'Anytime' by default when searchingEmilio Pozuelo Monfort2011-04-261-0/+4
| | | |
| | * | Block the callback when clearing the storeEmilio Pozuelo Monfort2011-04-251-0/+9
| | | |
| | * | Switch remaining functions to the new styleEmilio Pozuelo Monfort2011-04-251-218/+238
| | | |
| | * | LogWindow: Add live search supportEmilio Pozuelo Monfort2011-04-251-3/+12
| | | |
| | * | LogWindow: Show dates properlyEmilio Pozuelo Monfort2011-04-251-8/+46
| | | |
| | * | LogWindow: Add multiselection to the 'When' paneEmilio Pozuelo Monfort2011-04-251-50/+93
| | | |
| | * | Stop processing logger calls when unneededEmilio Pozuelo Monfort2011-04-251-8/+36
| | | |
| | * | Add _tpl_action_chain_clearEmilio Pozuelo Monfort2011-04-252-0/+8
| | | |
| | * | Populate from 'Anyone' when changing the accountEmilio Pozuelo Monfort2011-04-251-4/+19
| | | |
| | * | Make 'Anyone' workEmilio Pozuelo Monfort2011-04-251-4/+44
| | | |
| | * | LogWindow: Add multiselection to the 'Who' paneEmilio Pozuelo Monfort2011-04-251-95/+195
| | | |
| | * | LogWindow: Add multiselection to the 'What' paneEmilio Pozuelo Monfort2011-04-251-4/+41
| | | |
| | * | log_window_chats_get_selected -> log_window_get_selectedEmilio Pozuelo Monfort2011-04-221-5/+5
| | | |
| | * | LogWindow: convert the event view to a treeviewEmilio Pozuelo Monfort2011-04-202-40/+366
| | | | | | | | | | | | | | | | Following the design.
| | * | Add icons for missed/incoming/outgoing callsEmilio Pozuelo Monfort2011-04-201-0/+4
| | | |
| | * | Complete rewrite of the history windowEmilio Pozuelo Monfort2011-04-203-1339/+1721
| | | | | | | | | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=619866
| | * | account_chooser_find_account_foreach: check the col typeEmilio Pozuelo Monfort2011-04-201-1/+8
| | | | | | | | | | | | | | | | As non ROW_ACCOUNT rows don't have an account.
| | * | AccountChooser: add empathy_account_chooser_get_account_manager()Emilio Pozuelo Monfort2011-04-202-1/+10
| | | |
| | * | TplActionChain: add _tpl_action_chain_start()Emilio Pozuelo Monfort2011-04-202-1/+20
| | | |
| | * | Copy TplActionChain from telepathy-loggerEmilio Pozuelo Monfort2011-04-203-0/+218
| | | |
| | * | Don't ignore call eventsEmilio Pozuelo Monfort2011-04-201-21/+32
| | | |
| * | | Don't build a shared telepathy-yellEmilio Pozuelo Monfort2011-04-271-0/+3
| | | |
| * | | Merge remote-tracking branch 'danni/manage-credit-uri' into empathy-skypeEmilio Pozuelo Monfort2011-04-271-22/+26
| |\ \ \
| | * | | Support Conn.I.Balance.ManageCreditURIDanielle Madeley2011-04-271-22/+26
| | | | |
| * | | | Merge branch 'detailed-errors' into empathy-skypeDanielle Madeley2011-04-272-8/+114
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use skype-reason detail to return a Skype-specific error messageDanielle Madeley2011-04-202-8/+115
| | | | | | | | | | | | | | | | | | | | Required for Skype certification.
* | | | | Add patch to fix builddebian/2.34.0+git.20110425.93f10e-0ubuntu0+easton1Emilio Pozuelo Monfort2011-04-263-0/+18
| | | | |
* | | | | New upstream snapshotEmilio Pozuelo Monfort2011-04-261-0/+6
| | | | |
* | | | | Merge branch 'empathy-skype' into debianEmilio Pozuelo Monfort2011-04-2626-492/+835
|\| | | |
| * | | | Merge branch 'balance-31-2' into empathy-skypeDanielle Madeley2011-04-215-3/+433
| |\ \ \ \
| | * | | | Update formatting for NOKDanielle Madeley2011-04-211-1/+1
| | | | | |
| | * | | | The icon needs to be set as "icon-name" not "stock-id"Danielle Madeley2011-04-191-1/+3
| | | | | |
| | * | | | Fill out empathy_format_currency() with more currenciesDanielle Madeley2011-04-181-8/+9
| | | | | |
| | * | | | Use pointless g* types for consistencyDanielle Madeley2011-04-182-5/+5
| | | | | |
| | * | | | 'spacing' is an object property, not a child property of the packingDanielle Madeley2011-04-181-1/+1
| | | | | |
| | * | | | Add a menu item to choose whether to show account balances in the rosterDanielle Madeley2011-04-153-5/+38
| | | | | |
| | * | | | Create balance widget, tie it to the actionDanielle Madeley2011-04-152-4/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - show and hide balance widgets in response to a toggleaction
| | * | | | Factor out main_window_setup_balance_create_action()Danielle Madeley2011-04-151-26/+40
| | | | | |
| | * | | | Show top-up site for SkypeDanielle Madeley2011-04-151-1/+12
| | | | | |
| | * | | | Remove balance from menu when account is disconnectedDanielle Madeley2011-04-151-4/+34
| | | | | |
| | * | | | Add a menuitem to report the account balance for each accountDanielle Madeley2011-04-152-0/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a menu item for each connection that supports Conn.I.Balance, requests the current balance and then tracks further updates to the balance. TODO: - remove the menu item when the account is disconnected - implement the activated signal
| | * | | | Add method empathy_format_currency()Danielle Madeley2011-04-152-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method takes a Telepathy Currency_Amount and attempts to format it using currency rules appropriate for that amount. Unfortunately I haven't yet found a good summary of currency rules, so I've mostly been guessing. The currencies structure needs completing and checking.
| * | | | | Merge branch 'timestamp-rebase' into empathy-skypeDanielle Madeley2011-04-2119-489/+400
| |\ \ \ \ \
| | * | | | | Post-rebase: priv->location is not compatible with tp_asv_* in this branchDanielle Madeley2011-04-211-1/+4
| | | | | | |
| | * | | | | chat_text_view_append_timestamp: use empathy_time_to_string_utc()Guillaume Desmottes2011-04-211-5/+1
| | | | | | |
| | * | | | | Port all timestamps from time_t to gint64 (#648188)Guillaume Desmottes2011-04-2114-97/+111
| | | | | | |
| | * | | | | empathy-time: remove unused functionsGuillaume Desmottes2011-04-212-52/+0
| | | | | | |
| | * | | | | empathy-message: cast timestamps to glongGuillaume Desmottes2011-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tp_message_get_received_timestamp() and tpl_event_get_timestamp() both return gint64 while the timestamp is stored as a glong. We need to cast it as varargs won't do it for us and not casting will result in a a sizing mismatch on 32-bit. Ideally we should stop using time_t and always use gint64 with timestamps.
| | * | | | | empathy_message_new_from_tp_message: assign priv as soon as the message is ↵Guillaume Desmottes2011-04-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | created
| | * | | | | use the TpChannel:chat-state-changed signalGuillaume Desmottes2011-04-211-7/+4
| | | | | | |
| | * | | | | use delivery report instead of Text.SendErrorGuillaume Desmottes2011-04-211-25/+50
| | | | | | |
| | * | | | | factor out handle_incoming_message()Guillaume Desmottes2011-04-211-23/+17
| | | | | | |
| | * | | | | empathy-message: remove useless public settersGuillaume Desmottes2011-04-212-132/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the GParamFlags of properties.
| | * | | | | remove empathy_message_new()Guillaume Desmottes2011-04-212-16/+7
| | | | | | |
| | * | | | | use tp_text_channel_send_message_async()Guillaume Desmottes2011-04-213-29/+79
| | | | | | |
| | * | | | | Port empathy_tp_chat_get_self_contact() from masterDanielle Madeley2011-04-212-0/+11
| | | | | | |
| | * | | | | chat_send_error_cb: don't display the message if it's NULLGuillaume Desmottes2011-04-211-3/+8
| | | | | | |
| | * | | | | factor out empathy_message_new_from_tp_messageGuillaume Desmottes2011-04-213-68/+53
| | | | | | |
| | * | | | | empathy-message: add missing getter/setterGuillaume Desmottes2011-04-211-0/+18
| | | | | | |
| | * | | | | use TpTextChannel:message-sentGuillaume Desmottes2011-04-211-17/+15
| | | | | | |
| | * | | | | use TpTextChannel:message-receivedGuillaume Desmottes2011-04-211-27/+25
| | | | | | |
| | * | | | | use tp_text_channel_get_pending_messages() to get the pending messagesGuillaume Desmottes2011-04-211-57/+34
| | | | | | |
| | * | | | | empathy-tp-chat: ensure that we get a TpTextChannelGuillaume Desmottes2011-04-213-2/+12
| |/ / / / /