Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | New upstream snapshotdebian/2.34.0+git.20110701.a51242-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-07-02 | 1 | -0/+6 |
| | |||||
* | Merge branch 'ppa-bug-fixes' into debian | Emilio Pozuelo Monfort | 2011-07-02 | 4 | -11/+269 |
|\ | |||||
| * | Add a dialpad to the New conversation and New call dialogs | Emilio Pozuelo Monfort | 2011-06-30 | 2 | -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 alias | Emilio Pozuelo Monfort | 2011-06-30 | 1 | -2/+81 |
| | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=653650 | ||||
| * | LogWindow: keep the selected dates when changing Who or What | Emilio Pozuelo Monfort | 2011-06-29 | 1 | -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+easton1 | Emilio Pozuelo Monfort | 2011-06-17 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'ppa-bug-fixes' into debian | Emilio Pozuelo Monfort | 2011-06-17 | 2 | -2/+13 |
|\| | |||||
| * | Hide the password entry for Skype accounts in the assistant | Emilio Pozuelo Monfort | 2011-06-17 | 2 | -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+easton1 | Emilio Pozuelo Monfort | 2011-06-10 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'ppa-bug-fixes' into debian | Emilio Pozuelo Monfort | 2011-06-10 | 3 | -8/+24 |
|\| | |||||
| * | Don't unref NULL pointers | Emilio Pozuelo Monfort | 2011-06-10 | 1 | -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 match | Emilio Pozuelo Monfort | 2011-06-10 | 1 | -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 it | Danielle Madeley | 2011-06-10 | 1 | -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+easton1 | Emilio Pozuelo Monfort | 2011-06-07 | 2 | -1/+2 |
| | | |||||
* | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-06-07 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-06-07 | 3 | -56/+24 |
|\| | |||||
| * | Merge branch 'search-columns-193' into empathy-skype | Danielle Madeley | 2011-06-03 | 1 | -8/+15 |
| |\ | |||||
| | * | Use some markup to make the logs more readable | Danielle Madeley | 2011-05-27 | 1 | -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 pane | Danielle Madeley | 2011-05-27 | 1 | -0/+2 |
| | | | |||||
| | * | Remove unrequired COL_WHAT_EXPANDER | Danielle Madeley | 2011-05-27 | 1 | -3/+1 |
| | | | |||||
| | * | [log-viewer] set search columns | Danielle Madeley | 2011-05-27 | 1 | -0/+5 |
| | | | |||||
| * | | Remove AllowVideoFrom setting | Emilio Pozuelo Monfort | 2011-06-01 | 2 | -48/+9 |
| |/ | |||||
* | | Bump minimum logger versiondebian/2.34.0+git.20110531.338a6e-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-05-31 | 2 | -1/+2 |
| | | |||||
* | | Patches refreshed | Emilio Pozuelo Monfort | 2011-05-31 | 5 | -27/+28 |
| | | |||||
* | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-05-31 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-31 | 9 | -25/+332 |
|\| | |||||
| * | Merge branch 'message-editing-48-more' into empathy-skype | Danielle Madeley | 2011-05-27 | 9 | -25/+332 |
| |\ | |||||
| | * | Bump to released TPL version 0.2.10 | Danielle Madeley | 2011-05-27 | 1 | -1/+1 |
| | | | |||||
| | * | Update for new TPL API, we now get timestamp and edit_timestamp | Danielle Madeley | 2011-05-27 | 1 | -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 message | Danielle Madeley | 2011-05-26 | 1 | -12/+9 |
| | | | |||||
| | * | Replace tpl_text_event_dup_supersedes() with synthetic message | Danielle Madeley | 2011-05-26 | 1 | -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 EmpathyMessage | Danielle Madeley | 2011-05-26 | 2 | -3/+36 |
| | | | |||||
| | * | Set the edited icon for edited messages in the log viewer | Danielle Madeley | 2011-05-25 | 1 | -0/+7 |
| | | | |||||
| | * | Get the original message from the logger so we can supersede it | Danielle Madeley | 2011-05-25 | 2 | -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 logger | Danielle Madeley | 2011-05-25 | 2 | -5/+8 |
| | | | |||||
| | * | Add an icon to edited messages | Danielle Madeley | 2011-05-25 | 2 | -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 edited | Danielle Madeley | 2011-05-25 | 1 | -0/+14 |
| | | | |||||
| | * | [theme-adium] implement edit_message() | Danielle Madeley | 2011-05-25 | 2 | -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 again | Danielle Madeley | 2011-05-25 | 1 | -4/+16 |
| | | | | | | | | | | | | This will enable our DOM manipulation | ||||
| | * | Pass edited messages through to the ChatView | Danielle Madeley | 2011-05-20 | 1 | -12/+25 |
| | | | |||||
| | * | Add edit_message() method to ChatView iface | Danielle Madeley | 2011-05-20 | 2 | -0/+16 |
| | | | |||||
| | * | Add 'supersedes' property to EmpathyMessage | Danielle Madeley | 2011-05-20 | 2 | -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 EmpathyMessage | Danielle Madeley | 2011-05-18 | 2 | -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+easton1 | Emilio Pozuelo Monfort | 2011-05-27 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-27 | 11 | -72/+220 |
|\| | | |||||
| * | | Clear audio_output when the call ends | Emilio Pozuelo Monfort | 2011-05-27 | 1 | -0/+5 |
| | | | | | | | | | | | | So we create a new one when redialing instead of reusing it. | ||||
| * | | Update telepathy-yell submodule | Emilio Pozuelo Monfort | 2011-05-27 | 1 | -0/+0 |
| | | | |||||
| * | | Reopen tabs as SMS channels when appropriate | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -0/+6 |
| | | | |||||
| * | | Set a parent for the error dialog | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -5/+7 |
| | | | |||||
| * | | NewMessageDialog: show an error if starting the channel fails | Emilio Pozuelo Monfort | 2011-05-26 | 1 | -2/+77 |
| | | | |||||
| * | | empathy_dispatcher_chat_with_contact_id(): add optional cb | Emilio Pozuelo Monfort | 2011-05-26 | 8 | -23/+40 |
| | | | |||||
| * | | Remove the balance action when an account is removed | Danielle Madeley | 2011-05-26 | 1 | -38/+48 |
| | | | |||||
| * | | Merge branch 'gnome-2-34' into empathy-skype | Danielle Madeley | 2011-05-26 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | empathy_chat_window_present_chat: always show newly created windows | Guillaume Desmottes | 2011-05-26 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | We just create so we should at least show it. | ||||
| * | | | CallWindow: show 'On hold' in the statusbar when appropriate | Emilio Pozuelo Monfort | 2011-05-23 | 1 | -3/+38 |
| | | | | |||||
| * | | | Directly call the callback if we're ready | Emilio Pozuelo Monfort | 2011-05-23 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | Instead of duplicating the code in two places. | ||||
* | | | | New upstream snapshotdebian/2.34.0+git.20110520.5773ec-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-05-21 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-21 | 17 | -131/+242 |
|\| | | | |||||
| * | | | Use the official Skype icon | Emilio Pozuelo Monfort | 2011-05-21 | 6 | -36/+34 |
| | | | | |||||
| * | | | Merge branch 'sms-topup-154-2' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-20 | 4 | -1/+90 |
| |\ \ \ | |||||
| | * | | | EmpathyChat: add a 'Top up' link when there's not enough credit | Emilio Pozuelo Monfort | 2011-05-18 | 1 | -1/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is only added for Adium themes since ChatTextView ones don't support markup. | ||||
| | * | | | EmpathyThemeAdium: implement append_event_markup | Emilio Pozuelo Monfort | 2011-05-18 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Add empathy_chat_view_append_event_markup | Emilio Pozuelo Monfort | 2011-05-18 | 2 | -0/+22 |
| | | | | | |||||
| * | | | | Disable textview themes | Emilio Pozuelo Monfort | 2011-05-19 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | log_window_chats_set_selected: only act on normal rows | Emilio Pozuelo Monfort | 2011-05-18 | 1 | -0/+5 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'alias-upstream-166' into empathy-skype | Danielle Madeley | 2011-05-18 | 1 | -5/+65 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Update our local fields having Overwritten_By_Nickname when updating our ↵ | Guillaume Desmottes | 2011-05-18 | 1 | -0/+43 |
| | | | | | | | | | | | | | | | | nickname (#644298) | ||||
| | * | | Import get_spec_from_list() from master | Danielle Madeley | 2011-05-18 | 1 | -0/+17 |
| | | | | |||||
| | * | | don't update Alias.Nickname if not needed | Guillaume Desmottes | 2011-05-16 | 1 | -2/+9 |
| | | | | |||||
| | * | | inline set_alias_on_account() | Guillaume Desmottes | 2011-05-16 | 1 | -10/+3 |
| | | | | |||||
| * | | | Merge branch 'redial-169-2' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-17 | 3 | -86/+35 |
| |\ \ \ | |||||
| | * | | | Implement empathy_call_handler_start_call() for redialing | Emilio Pozuelo Monfort | 2011-05-16 | 1 | -12/+18 |
| | | | | | |||||
| | * | | | CallHandler: move on_call_accepted_cb() around | Emilio Pozuelo Monfort | 2011-05-16 | 1 | -15/+15 |
| | | | | | |||||
| | * | | | CallHandler: emit signal with the correct parameters | Emilio Pozuelo Monfort | 2011-05-16 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Remove empathy_call_factory_new_call_with_streams | Emilio Pozuelo Monfort | 2011-05-16 | 2 | -58/+0 |
| | |/ / | | | | | | | | | | | | | It's unused and empathy_call_new_with_streams is better. | ||||
| * / / | Don't reset the alias when using empathy_contact_from_tpl_contact | Emilio Pozuelo Monfort | 2011-05-17 | 1 | -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+easton1 | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-13 | 2 | -17/+11 |
|\| | | |||||
| * | | Only follow available cameras if the contact can do Video calls | Emilio Pozuelo Monfort | 2011-05-13 | 2 | -17/+11 |
| | | | |||||
* | | | Build with gudev support for camera detection | Emilio Pozuelo Monfort | 2011-05-13 | 3 | -1/+3 |
| | | | |||||
* | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-13 | 19 | -141/+1041 |
|\| | | |||||
| * | | Merge branch 'dialpad-163' into empathy-skype | Danielle Madeley | 2011-05-13 | 4 | -98/+86 |
| |\ \ | |||||
| | * | | Add letters underneath the numbers on the dialpad | Danielle Madeley | 2011-05-13 | 1 | -13/+39 |
| | | | | |||||
| | * | | Factor out dialpad into a utility function | Danielle Madeley | 2011-05-13 | 4 | -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 connected | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -1/+18 |
| | | | | |||||
| * | | | CallWindow: disable Video functionality if there's no camera | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -1/+23 |
| | | | | |||||
| * | | | Bind 'Video call' menu items to available cameras | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -0/+7 |
| | | | | |||||
| * | | | A contact doesn't support video if we have no camera | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -2/+13 |
| | | | | |||||
| * | | | NewCallDialog: make 'Enable video' unsensitive when there's no camera | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -0/+19 |
| | | | | |||||
| * | | | Add empathy_camera_monitor_get_available | Emilio Pozuelo Monfort | 2011-05-13 | 2 | -0/+9 |
| | | | | |||||
| * | | | Optionally check for gudev for camera monitoring | Emilio Pozuelo Monfort | 2011-05-13 | 2 | -1/+29 |
| | | | | |||||
| * | | | Don't disable video calls when built without udev | Emilio Pozuelo Monfort | 2011-05-13 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add EmpathyCameraMonitor | Emilio Pozuelo Monfort | 2011-05-13 | 3 | -2/+232 |
| | | | | |||||
| * | | | Add CheeseCameraDeviceMonitor from libcheese | Emilio Pozuelo Monfort | 2011-05-12 | 3 | -3/+485 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-11 | 6 | -7/+9 |
| |\| | | | | | | | | | | | | | Conflicts: libempathy/empathy-contact.c | ||||
| | * | contact: fix typo when creating new contact from logger entity | Jonny Lamb | 2011-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Jonny Lamb <jonnylamb@gnome.org> | ||||
| | * | Include gi18n-lib.h in library sources, not gi18n.h. | Gabor Kelemen | 2011-05-05 | 5 | -5/+7 |
| | | | | | | | | | | | | Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=649379 | ||||
| * | | Use a weak ref to remove the tpcontact from the hashtable | Emilio Pozuelo Monfort | 2011-05-10 | 1 | -11/+14 |
| | | | |||||
| * | | LogWindow: Don't cut the log messages | Emilio Pozuelo Monfort | 2011-05-10 | 1 | -1/+0 |
| | | | |||||
| * | | LogWindow: better logic for the buttons sensitivity | Emilio Pozuelo Monfort | 2011-05-10 | 1 | -12/+55 |
| | | | |||||
| * | | empathy_contact_from_tpl_contact: set the TpContact | Emilio Pozuelo Monfort | 2011-05-10 | 1 | -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+easton1 | Emilio Pozuelo Monfort | 2011-05-06 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-06 | 6 | -75/+47 |
|\| | | |||||
| * | | Include SMSChannel property in empathy_chat_window_find_chat() | Danielle Madeley | 2011-05-05 | 3 | -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 Madeley | 2011-05-05 | 5 | -52/+6 |
| | | | | | | | | | | | | This reverts commit 0b213f4fae18f24fd7b162ca19c63249cd360e43. | ||||
| * | | Revert "Make empathy_chat_window_find_chat() static" | Danielle Madeley | 2011-05-05 | 2 | -3/+3 |
| | | | | | | | | | | | | This reverts commit e84d41efe4b2febb9f3276e54f603550c929a69d. | ||||
| * | | Always call additional_apply_async() so that the password is fed to the observer | Danielle Madeley | 2011-05-05 | 1 | -7/+15 |
| | | | |||||
| * | | Merge branch 'tooltip-143' into empathy-skype | Danielle Madeley | 2011-05-05 | 2 | -10/+16 |
| |\ \ | |||||
| | * | | Add a tooltip to the sending message spinner | Danielle Madeley | 2011-05-04 | 1 | -6/+11 |
| | | | | |||||
| | * | | Fix broken logic that caused delivery report spinner to spin forever | Danielle Madeley | 2011-05-04 | 1 | -4/+5 |
| | | | | |||||
* | | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-05-04 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-05-04 | 14 | -101/+272 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'public-upstream/gnome-2-34' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-04 | 1 | -5/+5 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Correct the interface names used in Empathy.Call.client | Sjoerd Simons | 2011-05-04 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'balance-ui-updates' into empathy-skype | Danielle Madeley | 2011-05-04 | 2 | -21/+38 |
| |\ \ | |||||
| | * | | Change the menu to say "Credit Balance" | Danielle Madeley | 2011-05-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update balance view in roster per feedback | Danielle Madeley | 2011-05-03 | 1 | -14/+25 |
| | | | | |||||
| | * | | Change menu string to "Top up Skype ($1.23)..." | Danielle Madeley | 2011-05-03 | 1 | -8/+14 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'public/gnome-2-34' into empathy-skype | Sjoerd Simons | 2011-05-04 | 1 | -23/+15 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Keep a persistent source video tee around | Sjoerd Simons | 2011-05-04 | 1 | -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 logs | Emilio Pozuelo Monfort | 2011-05-03 | 1 | -1/+4 |
| | | | | |||||
| * | | | Show an spinner while logs are being retrieved | Emilio Pozuelo Monfort | 2011-05-03 | 2 | -4/+103 |
| | | | | |||||
| * | | | LogWindow: scroll the events view to the end | Emilio Pozuelo Monfort | 2011-05-03 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | Where newest messages are. | ||||
| * | | | LogWindow: select the first normal date by default | Emilio Pozuelo Monfort | 2011-05-03 | 1 | -2/+3 |
| | | | | |||||
| * | | | LogWindow: set 'All accounts' by default | Emilio Pozuelo Monfort | 2011-05-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add empathy_account_chooser_set_all | Emilio Pozuelo Monfort | 2011-05-03 | 2 | -0/+25 |
| | |/ | |/| | |||||
| * | | Merge branch 'gnome-2-34' into empathy-skype | Emilio Pozuelo Monfort | 2011-05-02 | 7 | -43/+56 |
| |\| | |||||
| | * | Bug 646227 — Possible overflow in persona-view:drag_data_get | Philip Withnall | 2011-05-02 | 3 | -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 Desmottes | 2011-05-02 | 1 | -1/+6 |
| | | | | | | | | | | | | cache before creating new pixbuf | ||||
| | * | main_window_flash_foreach: don't leak the pixbuf returned by ↵ | Guillaume Desmottes | 2011-05-02 | 1 | -0/+3 |
| | | | | | | | | | | | | empathy_pixbuf_from_icon_name | ||||
| | * | set a not empty string when setting ↵ | Guillaume Desmottes | 2011-05-02 | 2 | -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 variable | Emilio Pozuelo Monfort | 2011-05-02 | 1 | -2/+5 |
| | | | |||||
* | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-05-04 | 1 | -0/+6 |
| | | | |||||
* | | | Refresh patchesdebian/2.34.0+git.20110429.1c68ea-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-04-29 | 7 | -31/+33 |
| | | | |||||
* | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-04-29 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-04-29 | 13 | -71/+413 |
|\| | | |||||
| * | | Show an infobar if there's not enough credit | Emilio Pozuelo Monfort | 2011-04-29 | 2 | -8/+118 |
| | | | | | | | | | | | | With a button to buy some if desired. | ||||
| * | | Generate closures for empathy-call | Emilio Pozuelo Monfort | 2011-04-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'double-eula-121' into empathy-skype | Danielle Madeley | 2011-04-29 | 3 | -28/+52 |
| |\ \ | |||||
| | * | | Update .gitignore | Danielle Madeley | 2011-04-29 | 1 | -0/+1 |
| | | | | |||||
| | * | | Don't show the EULA twice | Danielle Madeley | 2011-04-29 | 1 | -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 lifetime | Danielle Madeley | 2011-04-28 | 1 | -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-skype | Danielle Madeley | 2011-04-28 | 5 | -28/+204 |
| |\ \ \ | |||||
| | * | | | [chat-window] add a spinner to the window tab for when messages are being sent | Danielle Madeley | 2011-04-28 | 1 | -0/+34 |
| | | | | | |||||
| | * | | | [chat] expose this property in EmpathyChat | Danielle Madeley | 2011-04-28 | 2 | -0/+46 |
| | | | | | |||||
| | * | | | [tp-chat] add a counter for the number of pending messages | Danielle Madeley | 2011-04-28 | 2 | -3/+85 |
| | | | | | | | | | | | | | | | | | | | | Requires delivery reports to include delivery-token. | ||||
| | * | | | Use dbus-error from delivery report for better errors | Danielle Madeley | 2011-04-28 | 2 | -25/+39 |
| | | | | | |||||
| * | | | | Merge branch 'fix-33-properly' into empathy-skype | Danielle Madeley | 2011-04-28 | 2 | -5/+22 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Only disable other accounts if we're creating an account | Danielle Madeley | 2011-04-28 | 1 | -4/+8 |
| | | | | | |||||
| | * | | | Set the parent and check the return value correctly | Danielle Madeley | 2011-04-28 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | The parent is currently unused, but it's nice to set it correctly anyway. | ||||
| | * | | | Fix logic error introduced in ad4626eb | Danielle Madeley | 2011-04-28 | 1 | -4/+8 |
| | |/ / | |||||
| * | | | Ensure tp-logger was compiled with Call support | Danielle Madeley | 2011-04-28 | 1 | -0/+15 |
| | | | | |||||
| * | | | tp-logger 0.2.8 is required for Call support | Danielle Madeley | 2011-04-28 | 1 | -1/+1 |
| |/ / | |||||
* | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-04-28 | 3 | -17/+7 |
| | | | |||||
* | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-04-28 | 15 | -1567/+3122 |
|\| | | |||||
| * | | empathy_message_new is gone, use g_object_new | Emilio Pozuelo Monfort | 2011-04-28 | 1 | -15/+12 |
| | | | |||||
| * | | Merge remote-tracking branch 'pochu-public/log-window-619866' into empathy-skype | Emilio Pozuelo Monfort | 2011-04-28 | 11 | -1530/+2975 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: libempathy-gtk/empathy-log-window.c libempathy/empathy-message.c | ||||
| | * | | Display date and time in the event treeview | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -3/+6 |
| | | | | |||||
| | * | | Make the three panes a bit taller by default | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add a clear icon to the search entry | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -0/+23 |
| | | | | |||||
| | * | | Don't use global variables | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -12/+13 |
| | | | | |||||
| | * | | Fix buttons to work again with multiselection | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -35/+48 |
| | | | | |||||
| | * | | Use a define instead of hardcoding a magic number | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -2/+4 |
| | | | | |||||
| | * | | Use a for instead of a do while to avoid returning early | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | So we always free the stuff at the end of the function. | ||||
| | * | | Don't leak the account and entity | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -3/+6 |
| | | | | |||||
| | * | | Don't leak paths | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Compare against NULL | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Be neutral | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Style: use braces consistently | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -11/+31 |
| | | | | |||||
| | * | | Return early if the iter isn't a top level | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -6/+7 |
| | | | | |||||
| | * | | Use a macro for magic numbers | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -1/+4 |
| | | | | |||||
| | * | | Don't leak the account and entity | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -6/+9 |
| | | | | |||||
| | * | | Use tp_clear_pointer | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -2/+1 |
| | | | | |||||
| | * | | LogWindow: group MUC events properly | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -1/+30 |
| | | | | |||||
| | * | | LogWindow: check the 30min gap with the last message | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -2/+8 |
| | | | | |||||
| | * | | LogWindow: find the corrent parent for chat events | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -1/+6 |
| | | | | |||||
| | * | | LogWindow: Display /me messages properly | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -4/+14 |
| | | | | |||||
| | * | | make check fixes | Emilio Pozuelo Monfort | 2011-04-27 | 3 | -2/+3 |
| | | | | |||||
| | * | | Remove more dead code | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -6/+0 |
| | | | | |||||
| | * | | Use a do while instead of a for loop where appropriate | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -2/+2 |
| | | | | |||||
| | * | | Remove dead code | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -3/+0 |
| | | | | |||||
| | * | | Fix comment | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -3/+2 |
| | | | | |||||
| | * | | Remove stray print statements | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -6/+4 |
| | | | | |||||
| | * | | Remove dead code | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -30/+0 |
| | | | | |||||
| | * | | LogWindow: don't add duplicate dates | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -11/+15 |
| | | | | |||||
| | * | | LogWindow: add 'Anyone' to search results | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -3/+1 |
| | | | | |||||
| | * | | LogWindow: select 'Anytime' by default when searching | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -0/+4 |
| | | | | |||||
| | * | | Block the callback when clearing the store | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -0/+9 |
| | | | | |||||
| | * | | Switch remaining functions to the new style | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -218/+238 |
| | | | | |||||
| | * | | LogWindow: Add live search support | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -3/+12 |
| | | | | |||||
| | * | | LogWindow: Show dates properly | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -8/+46 |
| | | | | |||||
| | * | | LogWindow: Add multiselection to the 'When' pane | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -50/+93 |
| | | | | |||||
| | * | | Stop processing logger calls when unneeded | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -8/+36 |
| | | | | |||||
| | * | | Add _tpl_action_chain_clear | Emilio Pozuelo Monfort | 2011-04-25 | 2 | -0/+8 |
| | | | | |||||
| | * | | Populate from 'Anyone' when changing the account | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -4/+19 |
| | | | | |||||
| | * | | Make 'Anyone' work | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -4/+44 |
| | | | | |||||
| | * | | LogWindow: Add multiselection to the 'Who' pane | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -95/+195 |
| | | | | |||||
| | * | | LogWindow: Add multiselection to the 'What' pane | Emilio Pozuelo Monfort | 2011-04-25 | 1 | -4/+41 |
| | | | | |||||
| | * | | log_window_chats_get_selected -> log_window_get_selected | Emilio Pozuelo Monfort | 2011-04-22 | 1 | -5/+5 |
| | | | | |||||
| | * | | LogWindow: convert the event view to a treeview | Emilio Pozuelo Monfort | 2011-04-20 | 2 | -40/+366 |
| | | | | | | | | | | | | | | | | Following the design. | ||||
| | * | | Add icons for missed/incoming/outgoing calls | Emilio Pozuelo Monfort | 2011-04-20 | 1 | -0/+4 |
| | | | | |||||
| | * | | Complete rewrite of the history window | Emilio Pozuelo Monfort | 2011-04-20 | 3 | -1339/+1721 |
| | | | | | | | | | | | | | | | | https://bugzilla.gnome.org/show_bug.cgi?id=619866 | ||||
| | * | | account_chooser_find_account_foreach: check the col type | Emilio Pozuelo Monfort | 2011-04-20 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | As non ROW_ACCOUNT rows don't have an account. | ||||
| | * | | AccountChooser: add empathy_account_chooser_get_account_manager() | Emilio Pozuelo Monfort | 2011-04-20 | 2 | -1/+10 |
| | | | | |||||
| | * | | TplActionChain: add _tpl_action_chain_start() | Emilio Pozuelo Monfort | 2011-04-20 | 2 | -1/+20 |
| | | | | |||||
| | * | | Copy TplActionChain from telepathy-logger | Emilio Pozuelo Monfort | 2011-04-20 | 3 | -0/+218 |
| | | | | |||||
| | * | | Don't ignore call events | Emilio Pozuelo Monfort | 2011-04-20 | 1 | -21/+32 |
| | | | | |||||
| * | | | Don't build a shared telepathy-yell | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'danni/manage-credit-uri' into empathy-skype | Emilio Pozuelo Monfort | 2011-04-27 | 1 | -22/+26 |
| |\ \ \ | |||||
| | * | | | Support Conn.I.Balance.ManageCreditURI | Danielle Madeley | 2011-04-27 | 1 | -22/+26 |
| | | | | | |||||
| * | | | | Merge branch 'detailed-errors' into empathy-skype | Danielle Madeley | 2011-04-27 | 2 | -8/+114 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Use skype-reason detail to return a Skype-specific error message | Danielle Madeley | 2011-04-20 | 2 | -8/+115 |
| | | | | | | | | | | | | | | | | | | | | Required for Skype certification. | ||||
* | | | | | Add patch to fix builddebian/2.34.0+git.20110425.93f10e-0ubuntu0+easton1 | Emilio Pozuelo Monfort | 2011-04-26 | 3 | -0/+18 |
| | | | | | |||||
* | | | | | New upstream snapshot | Emilio Pozuelo Monfort | 2011-04-26 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch 'empathy-skype' into debian | Emilio Pozuelo Monfort | 2011-04-26 | 26 | -492/+835 |
|\| | | | | |||||
| * | | | | Merge branch 'balance-31-2' into empathy-skype | Danielle Madeley | 2011-04-21 | 5 | -3/+433 |
| |\ \ \ \ | |||||
| | * | | | | Update formatting for NOK | Danielle Madeley | 2011-04-21 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | The icon needs to be set as "icon-name" not "stock-id" | Danielle Madeley | 2011-04-19 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Fill out empathy_format_currency() with more currencies | Danielle Madeley | 2011-04-18 | 1 | -8/+9 |
| | | | | | | |||||
| | * | | | | Use pointless g* types for consistency | Danielle Madeley | 2011-04-18 | 2 | -5/+5 |
| | | | | | | |||||
| | * | | | | 'spacing' is an object property, not a child property of the packing | Danielle Madeley | 2011-04-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add a menu item to choose whether to show account balances in the roster | Danielle Madeley | 2011-04-15 | 3 | -5/+38 |
| | | | | | | |||||
| | * | | | | Create balance widget, tie it to the action | Danielle Madeley | 2011-04-15 | 2 | -4/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: - show and hide balance widgets in response to a toggleaction | ||||
| | * | | | | Factor out main_window_setup_balance_create_action() | Danielle Madeley | 2011-04-15 | 1 | -26/+40 |
| | | | | | | |||||
| | * | | | | Show top-up site for Skype | Danielle Madeley | 2011-04-15 | 1 | -1/+12 |
| | | | | | | |||||
| | * | | | | Remove balance from menu when account is disconnected | Danielle Madeley | 2011-04-15 | 1 | -4/+34 |
| | | | | | | |||||
| | * | | | | Add a menuitem to report the account balance for each account | Danielle Madeley | 2011-04-15 | 2 | -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 Madeley | 2011-04-15 | 2 | -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-skype | Danielle Madeley | 2011-04-21 | 19 | -489/+400 |
| |\ \ \ \ \ | |||||
| | * | | | | | Post-rebase: priv->location is not compatible with tp_asv_* in this branch | Danielle Madeley | 2011-04-21 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | chat_text_view_append_timestamp: use empathy_time_to_string_utc() | Guillaume Desmottes | 2011-04-21 | 1 | -5/+1 |
| | | | | | | | |||||
| | * | | | | | Port all timestamps from time_t to gint64 (#648188) | Guillaume Desmottes | 2011-04-21 | 14 | -97/+111 |
| | | | | | | | |||||
| | * | | | | | empathy-time: remove unused functions | Guillaume Desmottes | 2011-04-21 | 2 | -52/+0 |
| | | | | | | | |||||
| | * | | | | | empathy-message: cast timestamps to glong | Guillaume Desmottes | 2011-04-21 | 1 | -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 Desmottes | 2011-04-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | created | ||||
| | * | | | | | use the TpChannel:chat-state-changed signal | Guillaume Desmottes | 2011-04-21 | 1 | -7/+4 |
| | | | | | | | |||||
| | * | | | | | use delivery report instead of Text.SendError | Guillaume Desmottes | 2011-04-21 | 1 | -25/+50 |
| | | | | | | | |||||
| | * | | | | | factor out handle_incoming_message() | Guillaume Desmottes | 2011-04-21 | 1 | -23/+17 |
| | | | | | | | |||||
| | * | | | | | empathy-message: remove useless public setters | Guillaume Desmottes | 2011-04-21 | 2 | -132/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the GParamFlags of properties. | ||||
| | * | | | | | remove empathy_message_new() | Guillaume Desmottes | 2011-04-21 | 2 | -16/+7 |
| | | | | | | | |||||
| | * | | | | | use tp_text_channel_send_message_async() | Guillaume Desmottes | 2011-04-21 | 3 | -29/+79 |
| | | | | | | | |||||
| | * | | | | | Port empathy_tp_chat_get_self_contact() from master | Danielle Madeley | 2011-04-21 | 2 | -0/+11 |
| | | | | | | | |||||
| | * | | | | | chat_send_error_cb: don't display the message if it's NULL | Guillaume Desmottes | 2011-04-21 | 1 | -3/+8 |
| | | | | | | | |||||
| | * | | | | | factor out empathy_message_new_from_tp_message | Guillaume Desmottes | 2011-04-21 | 3 | -68/+53 |
| | | | | | | | |||||
| | * | | | | | empathy-message: add missing getter/setter | Guillaume Desmottes | 2011-04-21 | 1 | -0/+18 |
| | | | | | | | |||||
| | * | | | | | use TpTextChannel:message-sent | Guillaume Desmottes | 2011-04-21 | 1 | -17/+15 |
| | | | | | | | |||||
| | * | | | | | use TpTextChannel:message-received | Guillaume Desmottes | 2011-04-21 | 1 | -27/+25 |
| | | | | | | | |||||
| | * | | | | | use tp_text_channel_get_pending_messages() to get the pending messages | Guillaume Desmottes | 2011-04-21 | 1 | -57/+34 |
| | | | | | | | |||||
| | * | | | | | empathy-tp-chat: ensure that we get a TpTextChannel | Guillaume Desmottes | 2011-04-21 | 3 | -2/+12 |
| |/ / / / / |