summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Use the official Skype iconEmilio Pozuelo Monfort2011-05-206-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
| | * | | EmpathyThemeAdium: implement append_event_markupEmilio Pozuelo Monfort2011-05-171-0/+9
| | * | | Add empathy_chat_view_append_event_markupEmilio Pozuelo Monfort2011-05-172-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 nick...Guillaume Desmottes2011-05-181-0/+43
| | * | 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
| | |/ /
| * | | Don't reset the alias when using empathy_contact_from_tpl_contactEmilio Pozuelo Monfort2011-05-171-1/+11
| |/ /
* | | 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
| * | | 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
| |\ \ | | |/
| | * contact: fix typo when creating new contact from logger entityJonny Lamb2011-05-111-2/+2
| | * Include gi18n-lib.h in library sources, not gi18n.h.Gabor Kelemen2011-05-055-5/+7
| * | 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
* | | 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
| * | Revert "[ChatroomManager] find windows by channel path, not by TargetID"Danielle Madeley2011-05-055-52/+6
| * | Revert "Make empathy_chat_window_find_chat() static"Danielle Madeley2011-05-052-3/+3
| * | Always call additional_apply_async() so that the password is fed to the observerDanielle Madeley2011-05-051-7/+15