gsoc2013-empathy - Google Summer of Code 2013 - GNOME

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'clutter-toolbar'	Emilio Pozuelo Monfort	2011-08-15	5	-13/+275
\|\
\| *	Update the constraint when the stage allocation changes	Emilio Pozuelo Monfort	2011-08-12	1	-5/+8
\| \| \| \| \| \| \| \|	Instead of when the box does, to avoid a warning.
\| *	CallWindow: raise the toolbar when showing the preview	Emilio Pozuelo Monfort	2011-08-12	1	-0/+1
\| \| \| \| \| \| \| \|	So that one can click the toolbar buttons.
\| *	CallWindow: make the preview margin a define	Emilio Pozuelo Monfort	2011-08-12	1	-2/+3
\| \|
\| *	Move the video preview up	Emilio Pozuelo Monfort	2011-08-12	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	So it's not on top of the floating toolbar. https://bugzilla.gnome.org/show_bug.cgi?id=656150
\| *	Make the floating toolbar have rounded corners	Emilio Pozuelo Monfort	2011-08-12	1	-1/+2
\| \| \| \| \| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656150
\| *	Add a GtkClutterActor subclass that clips the corners	Emilio Pozuelo Monfort	2011-08-12	3	-1/+134
\| \| \| \| \| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656150
\| *	CallWindow: show the toolbar when on fullscreen	Emilio Pozuelo Monfort	2011-08-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	And also hide it after 3s of inactivity. https://bugzilla.gnome.org/show_bug.cgi?id=656150
\| *	CallWindow: hide the toolbar after 3s of inactivity	Emilio Pozuelo Monfort	2011-08-12	1	-0/+66
\| \| \| \| \| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656150
\| *	CallWindow: make the toolbar float inside the window	Emilio Pozuelo Monfort	2011-08-12	2	-11/+63
\| \| \| \| \| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656150
* \|	CallWindow: get the mic volume upon init	Emilio Pozuelo Monfort	2011-08-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise it'll be zero and when we unmute the mic, we'll set the volume to zero as we won't know the old value. https://bugzilla.gnome.org/show_bug.cgi?id=656415
* \|	CallWindow: fix toggling the microphone on and off	Emilio Pozuelo Monfort	2011-08-15	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We are changing the GSettings key, and also listening to changes on it and reacting to them, but we don't want to react to our own changes! https://bugzilla.gnome.org/show_bug.cgi?id=656415
* \|	Updated Vietnamese translation	Ngô Chin	2011-08-13	1	-354/+248
\| \|
* \|	po/vi.po: import from Damned Lies	Nguyễn Thái Ngọc Duy	2011-08-13	1	-758/+1364
\| \|
* \|	Updated Persian translation	Arash Mousavi	2011-08-13	1	-751/+1308
\| \|
* \|	Properly check if the backlog flag is set	Sjoerd Simons	2011-08-12	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	The backlog flag should be TRUE or FALSE, so the check for the flag should result in either of those two values, not some other non-false value
* \|	Updated Norwegian bokmål translation	Kjartan Maraas	2011-08-10	1	-370/+422
\|/
*	LogWindow: don't crash if there are logs from the future	Emilio Pozuelo Monfort	2011-08-10	1	-1/+1
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656065
*	CallWindow: don't set the title for multiple participants	Emilio Pozuelo Monfort	2011-08-10	1	-1/+1
\| \| \| \| \| \| \|	We don't support that yet, the string is wrong, and priv->contact can't be NULL anyway. https://bugzilla.gnome.org/show_bug.cgi?id=655478
*	Updated Slovenian translation	Andrej Žnidaršič	2011-08-10	1	-53/+0
\|
*	Updated Swedish translation	Daniel Nylander	2011-08-08	1	-124/+139
\|
*	Updated Spanish translation	Daniel Mustieles	2011-08-08	1	-111/+122
\|
*	Updated Galician translations	Fran Dieguez	2011-08-07	1	-472/+555
\|
*	Updated Hebrew translation.	Yaron Shahrabani	2011-08-06	1	-377/+424
\|
*	EmpathyContactChooser: remove EmpathyTpChat property	Guillaume Desmottes	2011-08-05	3	-62/+3
\| \| \| \| \| \|	It's not used any more and a generic widget shouldn't need it. https://bugzilla.gnome.org/show_bug.cgi?id=656020
*	Implement TpContact selection in EmpathyInviteParticipantDialog	Guillaume Desmottes	2011-08-05	3	-56/+15
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656020
*	Implement filtering logic in EmpathyInviteParticipantDialog	Guillaume Desmottes	2011-08-05	3	-43/+131
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=656020
*	Add EmpathyContactChooser	Guillaume Desmottes	2011-08-05	4	-366/+594
\| \| \| \| \| \| \|	This is a pure code refactoring from EmpathyInviteParticipantDialog, this widget is not generic yet. https://bugzilla.gnome.org/show_bug.cgi?id=656020
*	Allow to enter an email address as Yahoo ID	Guillaume Desmottes	2011-08-04	1	-2/+4
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655959
*	Make the #defines an static array	Emilio Pozuelo Monfort	2011-08-04	4	-24/+38
\|
*	Use the new enum everywhere	Emilio Pozuelo Monfort	2011-08-04	6	-17/+48
\| \| \| \|	And use strings for the --show-preferences argument.
*	Preferences: add an enum for all the tabs	Emilio Pozuelo Monfort	2011-08-04	1	-0/+11
\|
*	CallWindow: go to the Calls tab when opening the preferences	Emilio Pozuelo Monfort	2011-08-04	1	-1/+1
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	Allow to specify the tab to open in the preferences	Emilio Pozuelo Monfort	2011-08-04	3	-8/+38
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	Preferences: add empathy_preferences_show_tab()	Emilio Pozuelo Monfort	2011-08-04	2	-0/+12
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: show Empathy.Call when opening the debug window	Emilio Pozuelo Monfort	2011-08-04	1	-1/+1
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	empathy-debugger: add a command line option to show a service	Emilio Pozuelo Monfort	2011-08-04	1	-1/+49
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	DebugWindow: add function to change the service to show	Emilio Pozuelo Monfort	2011-08-04	2	-0/+63
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	Factor out empathy_launch_program()	Emilio Pozuelo Monfort	2011-08-04	5	-163/+67
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: add a Settings menu item	Emilio Pozuelo Monfort	2011-08-04	2	-0/+57
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	Add a command line option to Empathy to show the preferences	Emilio Pozuelo Monfort	2011-08-04	1	-3/+39
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	MainWindow: add API to show the preferences window	Emilio Pozuelo Monfort	2011-08-04	2	-3/+11
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: add a 'Call log' menu	Emilio Pozuelo Monfort	2011-08-04	2	-0/+53
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: add a Help->About menu	Emilio Pozuelo Monfort	2011-08-04	3	-0/+18
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: add a Help->Contents menu	Emilio Pozuelo Monfort	2011-08-04	2	-0/+25
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: remove the hangup menu item	Emilio Pozuelo Monfort	2011-08-04	2	-9/+0
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	CallWindow: move 'Fullscreen' to the Call menu	Emilio Pozuelo Monfort	2011-08-04	1	-16/+8
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655884
*	Dialpad: show an entry with the entered numbers	Emilio Pozuelo Monfort	2011-08-04	1	-2/+31
\|
*	Updated Spanish translation	Daniel Mustieles	2011-08-04	1	-47/+55
\|
*	CallWindow: don't close the window when hanging up	Emilio Pozuelo Monfort	2011-08-03	1	-6/+3
\| \| \| \|	As one may want to redial.
*	CallWindow: show 'Mute' on the statusbar when muted	Emilio Pozuelo Monfort	2011-08-03	1	-1/+10
\|
*	call-window: use the input-dialpad icon	Guillaume Desmottes	2011-08-03	1	-1/+1
\| \| \| \|	Thanks a lot to Jakub Steiner for this awesome icon.
*	Updated Swedish translation	Daniel Nylander	2011-08-03	1	-41/+43
\|
*	empathy_send_file_with_file_chooser: keep on the contact while the dialog is ↵	Guillaume Desmottes	2011-08-02	1	-1/+2
\| \| \| \| \| \|	running It's not safe to assume that the EmpathyContact stays alive.
*	empathy_server_sasl_handler_class_init: properly initialize the dispose function	Alexey Fisher	2011-08-02	1	-1/+1
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=655788
*	Updated Hungarian translation by Balázs Meskó <meskobalazs at gmail dot com>	Gabor Kelemen	2011-08-02	1	-429/+498
\|
*	Move signal disconnection earlier to hopefully fix SEGV	Danielle Madeley	2011-08-02	1	-3/+3
\| \| \| \| \| \|	I can't actually reproduce this, but this is possibly the fix. (Hopefully) Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654914
*	preferences: update tab order	Jonny Lamb	2011-08-02	1	-2/+2
\| \| \| \| \| \| \|	This isn't pretty but I'm not sure if there's a better way of getting a specific tab from a GtkNotebook without using its order? Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
*	call-window: don't display labels in both toolbars	Guillaume Desmottes	2011-08-01	1	-0/+4
\|
*	help/.gitignore: add eu translation of the doc	Guillaume Desmottes	2011-08-01	1	-0/+2
\|
*	sort help/.gitignore	Guillaume Desmottes	2011-08-01	1	-18/+16
\|
*	Merge branch 'change-audio'	Jonny Lamb	2011-08-01	9	-24/+1021
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/empathy-call-window.c src/empathy-call-window.ui Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
\| *	audio-src: check for new enough pulsesrc before trying to change mics	Jonny Lamb	2011-07-30	1	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means this feature will automatically start working when a new enough pulsesrc is used. Making _get_microphones() fail has a nice side-effect that the Edit menu item doesn't appear at all. Neat. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: update to newer GstPulseSrc API	Jonny Lamb	2011-07-29	1	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \|	This time it's actually merged to master. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src,mic-menu: use DEBUG macros	Jonny Lamb	2011-07-29	2	-3/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: only call operations_run when PA is ready	Jonny Lamb	2011-07-29	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	mic-menu: display monitors when they're the current mic	Jonny Lamb	2011-07-29	1	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \|	...but otherwise hide them. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add is_monitor boolean to mic struct	Jonny Lamb	2011-07-29	3	-3/+9
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	call-window: add a Microphone menu to change mic on the fly	Jonny Lamb	2011-07-29	5	-1/+473
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Yay! Sorry this commit is kind of big with the addition of mic-menu, perhaps I should have added it in pieces. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	call-window: add getters for the UI manager and audio src	Jonny Lamb	2011-07-29	2	-0/+21
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: don't ignore monitors	Jonny Lamb	2011-07-29	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \|	pavucontrol doesn't... Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add comment about values for unknown values	Jonny Lamb	2011-07-29	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: set property IDs properly	Jonny Lamb	2011-07-29	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: listen to PA state changes and signal accordingly	Jonny Lamb	2011-07-29	1	-14/+104
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	src: give empathy-call sources to the marshal generator	Jonny Lamb	2011-07-29	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add some comments explaining the PA changes	Jonny Lamb	2011-07-29	1	-0/+6
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add API for getting the mic source ID	Jonny Lamb	2011-07-29	2	-0/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also listen out for changes in the source output ID (but that'll only happen if we go READY -> NULL -> READY again). Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add API for changing microphone	Jonny Lamb	2011-07-28	2	-0/+84
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add the source name to the microphone info struct	Jonny Lamb	2011-07-28	2	-0/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: add API to query available microphones	Jonny Lamb	2011-07-28	2	-0/+209
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	configure: depend on libpulse	Jonny Lamb	2011-07-28	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: remove the element-added stuff	Jonny Lamb	2011-07-28	1	-30/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Now that we hard-code pulsesrc, this is unnecessary. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: allow changing the audio source element	Jonny Lamb	2011-07-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Better than nothing, right? Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
\| *	audio-src: use pulsesrc instead of gconfaudiosrc	Jonny Lamb	2011-07-28	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
* \|	chat_text_maybe_append_date_and_time: compute the right delta between timestamps	Guillaume Desmottes	2011-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	The first argument of g_date_time_difference() should be the older timestamp. https://bugzilla.gnome.org/show_bug.cgi?id=654958
* \|	Update Simplified Chinese help translation.	lainme	2011-08-01	1	-293/+523
\| \|
* \|	Update Simplified Chinese translation.	Aron Xu	2011-08-01	1	-524/+576
\| \|
* \|	Updated Slovenian translation	Andrej Žnidaršič	2011-07-31	1	-86/+91
\| \|
* \|	Updated translation for Zulu (zu), reviewed by Priscilla Mahlangu	Abel Motha	2011-07-30	1	-823/+1424
\| \|
* \|	Uploaded Ukranian	Daniel Korostil	2011-07-30	1	-931/+1294
\| \|
* \|	Updated Spanish translation	Daniel Mustieles	2011-07-30	1	-294/+320
\| \|
* \|	Updated Traditional Chinese translation(Hong Kong and Taiwan)	Cheng-Chia Tseng	2011-07-29	2	-896/+1002
\| \|
* \|	Updated Swedish translation	Daniel Nylander	2011-07-29	1	-329/+349
\| \|
* \|	Added Basque language	Inaki Larranaga Murgoitio	2011-07-29	3	-1/+3528
\| \|
* \|	Updated Brazilian Portuguese translation	Felipe Borges	2011-07-28	1	-750/+1254
\| \|
* \|	CallWindow: pack the details box	Emilio Pozuelo Monfort	2011-07-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \|	Even if we don't show it, so that the widgets exist and we don't assert.
* \|	Show the percentage sign in the volume	Emilio Pozuelo Monfort	2011-07-28	2	-1/+14
\| \|
* \|	CallWindow: remove the sidebar	Emilio Pozuelo Monfort	2011-07-28	2	-282/+31
\| \| \| \| \| \| \| \|	And only leave the dialpad in its place.
* \|	CallWindow: use the volume value from the preferences	Emilio Pozuelo Monfort	2011-07-28	1	-79/+21
\| \| \| \| \| \| \| \| \| \|	This also removes the 'Audio input' sidebar page, as all of it can now be found in the preferences.
* \|	Preferences: add a Calls tab	Emilio Pozuelo Monfort	2011-07-28	2	-6/+173
\| \| \| \| \| \| \| \|	It only contains the micro volume for now.
* \|	Add a new gsettings key for the call volume	Emilio Pozuelo Monfort	2011-07-28	2	-0/+11
\| \|
* \|	CallWindow: use tp_g_signal_connect_object	Emilio Pozuelo Monfort	2011-07-28	1	-7/+6
\|/ \| \| \|	So the signals are disconnected when the window is destroyed.
*	CallWindow: build the toolbar from the .ui	Emilio Pozuelo Monfort	2011-07-28	2	-69/+66
\|
*	CallWindow: hide the audio/video call buttons on _init()	Emilio Pozuelo Monfort	2011-07-28	2	-2/+2
\| \| \| \| \|	When we create a new window it's because there's an incoming call, so hide the audio/video call buttons.
*	CallWindow: remove redial menu	Emilio Pozuelo Monfort	2011-07-28	2	-33/+0
\|
*	CallWindow: remove separator between hangup and dialpad buttons	Emilio Pozuelo Monfort	2011-07-28	1	-8/+0
\|
*	CallWindow: show audio and video call buttons to start a call	Emilio Pozuelo Monfort	2011-07-28	3	-15/+58
\| \| \| \|	Instead of the redial button.
*	CallWindow: add the remote user name and presence to the toolbar	Emilio Pozuelo Monfort	2011-07-28	1	-1/+45
\|
*	CallWindow: add an avatar to the top toolbar	Emilio Pozuelo Monfort	2011-07-28	1	-3/+40
\|
*	CallWindow: move the status message to the bottom toolbar	Emilio Pozuelo Monfort	2011-07-28	2	-34/+24
\| \| \| \|	From its own statusbar.
*	CallWindow: move the volume button to the bottom toolbar	Emilio Pozuelo Monfort	2011-07-28	2	-16/+17
\|
*	CallWindow: add a bottom toolbar	Emilio Pozuelo Monfort	2011-07-28	1	-24/+36
\| \| \| \|	And move some buttons to it following the new call UI design.
*	Updated Czech translation	Marek Černocký	2011-07-28	1	-692/+1111
\|
*	Add letters underneath the numbers on the dialpad	Danielle Madeley	2011-07-26	1	-13/+39
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=632874
*	Factor out dialpad into a utility function	Danielle Madeley	2011-07-26	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. Conflicts: libempathy-gtk/empathy-ui-utils.c src/empathy-call-window.c src/empathy-streamed-media-window.c
*	remove released flag	Xavier Claessens	2011-07-26	1	-1/+1
\|
*	prepare releaseEMPATHY_3_1_4	Xavier Claessens	2011-07-26	2	-2/+43
\|
*	Merge remote-tracking branch 'danni/populate-popup-654669'	Xavier Claessens	2011-07-26	1	-2/+4
\|\
\| *	Assume GDK_KEY_PRESS in the default case	Danielle Madeley	2011-07-26	1	-2/+4
\| \| \| \| \| \| \| \|	Warn if making this assumption.
* \|	Merge remote-tracking branch 'danni/drag-n-drop-558942'	Xavier Claessens	2011-07-26	3	-12/+52
\|\ \
\| * \|	Apply the same fix to EmpathyContactListView	Danielle Madeley	2011-07-26	1	-3/+3
\| \| \|
\| * \|	Don't generate critical when dragging with no contact selected	Danielle Madeley	2011-07-20	1	-3/+3
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	This also fixes the problem where dragging with no contact selected drags the previously selected contact. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=558942
\| *	Populate spelling suggestions when menu key is pressed	Danielle Madeley	2011-07-18	1	-6/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track what kind of event generated the populate-popup event and then use the cursor position or mouse position as appropriate. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=654669
* \|	Updated Spanish translation	Jorge González	2011-07-26	1	-121/+127
\| \|
* \|	CallWindow: fix comments	Emilio Pozuelo Monfort	2011-07-25	1	-3/+3
\| \| \| \| \| \| \| \|	We no longer show the self avatar
* \|	CallWindow: fix typo	Emilio Pozuelo Monfort	2011-07-25	1	-3/+3
\| \|
* \|	CallWindow: ignore events in the data probe callback	Emilio Pozuelo Monfort	2011-07-25	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We only want to show the remote video again if we receive video frames, not if we receive an event for whatever reason. That's in fact what we get when we start sending our own video, and so we don't want to display the remote video if it was hidden because we're not receiving it anymore.
* \|	CallWindow: check the video exists before showing it	Emilio Pozuelo Monfort	2011-07-25	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since empathy_call_window_show_video_output_cb() is called in an idle thread, it's possible that the video is removed before the function is executed, so check if it's still there before showing it.
* \|	CallWindow: show the remote avatar when video stops coming	Emilio Pozuelo Monfort	2011-07-25	1	-0/+67
\| \| \| \| \| \| \| \| \| \| \| \|	If we don't get incoming video for a few seconds, show the remote contact avatar instead of the frozen video, and show the video back if it starts coming again.
* \|	Merge branch 'irc-dialog'	Will Thompson	2011-07-25	3	-82/+205
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: <https://bugzilla.gnome.org/show_bug.cgi?id=654552> Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
\| * \|	IRC accounts: top-justify the password hint.	Will Thompson	2011-07-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As mentioned on <https://bugzilla.gnome.org/show_bug.cgi?id=654552#c13>, this makes the password hint text be right up against the field it's hinting about, at the cost of even more ugly space between it and the Advanced expander. I think this is the lesser of two evils.
\| * \|	IRC: validate 'username' parameter.	Will Thompson	2011-07-19	1	-0/+12
\| \| \|
\| * \|	IRC: rename “user_name” regex to “nick_name”	Will Thompson	2011-07-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 'account’ parameter in Telepathy, to which this regex applies, is the ‘nickname’ in IRC parlance. (I'm about to add a regex for what IRC calls ‘usernames’.)
\| * \|	IRC accounts: make labels the same width.	Will Thompson	2011-07-19	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This addresses Nick's concern on https://bugzilla.gnome.org/show_bug.cgi?id=654552
\| * \|	Add an advanced section to the IRC configuration page	Rob Sharp	2011-07-19	2	-80/+180
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-Move the Real Name and Quit Message to the advanced section -Add a new Username field to the advanced section https://bugzilla.gnome.org/show_bug.cgi?id=654552
* \| \|	CallWindow: remove unused box	Emilio Pozuelo Monfort	2011-07-21	1	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was taking horizontal space even if it was empty, causing the video widget to not take the full width when returning from fullscreen.
* \| \|	Set the video widget for the fullscreen window	Emilio Pozuelo Monfort	2011-07-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise the mouse cursor won't be hidden after a timeout and the 'Leave fullscreen' button won't dissapear when we unfullscreen the call window.
* \| \|	Updated Slovenian translation	Matej Urbančič	2011-07-20	1	-189/+218
\| \| \|
* \| \|	Revert "empathy_call_new_with_streams: prefer StreamedMedia over Call"	Emilio Pozuelo Monfort	2011-07-19	1	-15/+15
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default to Call channels again. https://bugzilla.gnome.org/show_bug.cgi?id=654611 This reverts commit 1cacc0945f81e0513013b83ca7488589dd6c61f7.
* /	Updated Swedish translation	Daniel Nylander	2011-07-19	1	-46/+32
\|/
*	Updated Swedish translation	Daniel Nylander	2011-07-15	1	-759/+1454
\|
*	Updated Hebrew translation.	Yaron Shahrabani	2011-07-15	1	-185/+214
\|
*	Debug logs will now be saved in the user's home directory rather than /tmp	Rob Sharp	2011-07-14	1	-1/+1
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=654541
*	release.py: detect bug numbers using their full URL	Guillaume Desmottes	2011-07-13	1	-2/+3
\| \| \| \| \|	git-bz uses the full address of the bug so best to support that format as well.
*	Updated Spanish translation	Daniel Mustieles	2011-07-13	1	-166/+192
\|
*	Updated Latvian translation.	Rudolfs Mazurs	2011-07-12	1	-821/+1233
\|
*	Updated Norwegian bokmål translation	Kjartan Maraas	2011-07-12	1	-186/+212
\|
*	LogWindow: stop retrieving logs if the window is closed	Emilio Pozuelo Monfort	2011-07-12	1	-1/+4
\|
*	Only follow available cameras if the contact can do Video calls	Emilio Pozuelo Monfort	2011-07-12	2	-16/+11
\|
*	LogWindow: disable Video calls if no camera connected	Emilio Pozuelo Monfort	2011-07-12	1	-1/+18
\|
*	CallWindow: disable Video functionality if there's no camera	Emilio Pozuelo Monfort	2011-07-12	1	-1/+12
\|
*	Bind 'Video call' menu items to available cameras	Emilio Pozuelo Monfort	2011-07-12	1	-0/+7
\|
*	A contact doesn't support video if we have no camera	Emilio Pozuelo Monfort	2011-07-12	1	-2/+13
\|
*	NewCallDialog: make 'Enable video' unsensitive when there's no camera	Emilio Pozuelo Monfort	2011-07-12	1	-0/+19
\|
*	Add empathy_camera_monitor_get_available	Emilio Pozuelo Monfort	2011-07-12	2	-0/+9
\|
*	Optionally check for gudev for camera monitoring	Emilio Pozuelo Monfort	2011-07-12	2	-1/+29
\|
*	Don't disable video calls when built without udev	Emilio Pozuelo Monfort	2011-07-12	1	-0/+5
\|
*	Add EmpathyCameraMonitor	Emilio Pozuelo Monfort	2011-07-12	3	-2/+232
\|
*	Add CheeseCameraDeviceMonitor from libcheese	Emilio Pozuelo Monfort	2011-07-12	3	-3/+485
\|
*	StreamedMediaWindow: don't use `call-window' for the geometry	Emilio Pozuelo Monfort	2011-07-12	1	-1/+1
\| \| \| \| \|	Use av-window instead, so Call and StreamedMedia windows' geometry isn't mixed as the windows are quite different now.
*	CallWindow: save the window geometry without the sidebar	Emilio Pozuelo Monfort	2011-07-12	3	-16/+85
\| \| \| \| \| \| \| \|	Since we don't show the sidebar when creating new call windows, we should not take the sidebar into account when saving the window geometry. https://bugzilla.gnome.org/show_bug.cgi?id=634809
*	CallWindow: properly determine the sidebar width	Emilio Pozuelo Monfort	2011-07-12	1	-5/+5
\| \| \| \| \| \| \|	The first time we show the sidebar, gtk_widget_get_allocation() doesn't return the correct width as the allocation hasn't been done yet. So use gtk_widget_get_preferred_width() as the minimum width is what is actually allocated.
*	CallWindow: add a dialpad tool button	Emilio Pozuelo Monfort	2011-07-12	2	-16/+52
\| \| \| \| \|	Rename the dialpad menu entry to Sidebar and move it to the View menu at the same time.
*	CallWindow: allow to show/hide the video preview	Emilio Pozuelo Monfort	2011-07-12	2	-3/+126
\| \| \| \| \| \|	There's now a button next to the video preview when it's shown and in a corner when it's hidden that allows to hide and show it.
*	CallWindow: only show one button to control the camera	Emilio Pozuelo Monfort	2011-07-12	2	-312/+18
\| \| \| \| \| \| \| \| \|	Having three buttons to control the camera clutters the UI. Displaying the video preview but not sending video is not very useful, and we'll add a way of sending video without displaying the preview by clicking on the preview itself. https://bugzilla.gnome.org/show_bug.cgi?id=611789
*	CallWindow: remove the Sidebar button	Emilio Pozuelo Monfort	2011-07-12	1	-32/+6
\|
*	CallWindow: flip the video preview	Emilio Pozuelo Monfort	2011-07-12	1	-0/+8
\|
*	CallWindow: add a little offset to the video preview	Emilio Pozuelo Monfort	2011-07-12	1	-4/+14
\|
*	CallWindow: set the video container background color	Emilio Pozuelo Monfort	2011-07-12	1	-0/+17
\| \| \| \|	...to match the rest of the window.
*	CallWindow: keep the aspect ratio of the remote video	Emilio Pozuelo Monfort	2011-07-12	1	-3/+5
\|
*	CallWindow: remove self avatar code	Emilio Pozuelo Monfort	2011-07-12	1	-33/+0
\| \| \| \|	We don't display the self avatar anymore.
*	CallWindow: set video preview on top of remote video	Emilio Pozuelo Monfort	2011-07-12	1	-66/+65
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=582442
*	CallWindow: use clutter to draw the remote video	Emilio Pozuelo Monfort	2011-07-12	1	-21/+25
\|
*	CallWindow: use clutter to draw the video preview	Emilio Pozuelo Monfort	2011-07-12	1	-24/+29
\|
*	empathy-call: initialize clutter	Emilio Pozuelo Monfort	2011-07-12	1	-0/+7
\|
*	Require clutter for empathy-call	Emilio Pozuelo Monfort	2011-07-12	1	-6/+9
\| \| \| \|	It will be used to display video output.
*	EmpathyContact: don't crash if a contact doesn't have an account	Emilio Pozuelo Monfort	2011-07-12	1	-3/+6
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=654256
*	CallWindow: don't add calls to searches if they don't match	Emilio Pozuelo Monfort	2011-07-12	1	-0/+15
\|
*	LogWindow: select 'Anyone' when searching	Emilio Pozuelo Monfort	2011-07-12	1	-3/+7
\|
*	LogWindow: don't crash when searching	Emilio Pozuelo Monfort	2011-07-12	1	-2/+3
\|
*	use tp_text_channel_ack_all_pending_messages_async()	Guillaume Desmottes	2011-07-11	3	-39/+2
\|
*	Set the DelegateToPreferredHandler hint	Guillaume Desmottes	2011-07-11	1	-0/+1
\| \| \| \| \| \| \|	This ensures that Empathy will always handle and display the channel, even if GNOME Shel is already handling it. https://bugzilla.gnome.org/show_bug.cgi?id=652439
*	coding style fixes	Guillaume Desmottes	2011-07-11	1	-4/+4
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=652439
*	update Punjabi Translation	A S Alam	2011-07-10	1	-701/+1192
\|
*	theme-adium: use the pending-message-id instead of message-token in ↵	Guillaume Desmottes	2011-07-08	1	-18/+24
\| \| \| \| \| \| \| \| \|	x-empathy-message-id message-token is not guaranteed to be implemented by all CMs while pending-message-id is (for incoming messages). https://bugzilla.gnome.org/show_bug.cgi?id=654015
*	bump tp-glib dep to 0.15.3	Guillaume Desmottes	2011-07-08	1	-1/+1
\| \| \| \|	We need it for tp_message_get_pending_message_id()
*	Updated Spanish translation	Daniel Mustieles	2011-07-06	1	-9/+9
\|
*	Call: flip video preview horizontally	Emilio Pozuelo Monfort	2011-07-05	3	-5/+37
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=639353
*	LogWindow: make type filters unsensitive as necessary	Emilio Pozuelo Monfort	2011-07-05	1	-0/+81
\| \| \| \| \| \| \|	If there are no events of one type, make its row in the What pane unsensitive. https://bugzilla.gnome.org/show_bug.cgi?id=653343
*	Updated Spanish translation	Jorge González	2011-07-05	1	-50/+56
\|
*	LogWindow: expand/collapse events when a row is activated	Emilio Pozuelo Monfort	2011-07-05	1	-0/+16
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=653341
*	Updated Galician translations	Fran Dieguez	2011-07-05	1	-135/+174
\|
*	Display `Chat in ...' for MUCs	Emilio Pozuelo Monfort	2011-07-05	1	-13/+21
\| \| \| \| \| \|	Instead of `Chat with ...'. https://bugzilla.gnome.org/show_bug.cgi?id=653175
*	LogWindow: really show the users' alias in the Who pane	Emilio Pozuelo Monfort	2011-07-05	1	-2/+13
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=653116
*	empathy_contact_from_tpl_contact: don't override the alias	Emilio Pozuelo Monfort	2011-07-05	5	-16/+40
\| \| \| \| \| \| \|	Add a logged-alias property instead, which can be used by those who need the old alias. And use it in chat themes for the backlog.
*	remove released flag	Guillaume Desmottes	2011-07-04	1	-1/+1
\|
*	prepare 3.1.3EMPATHY_3_1_3	Guillaume Desmottes	2011-07-04	2	-3/+56
\|
*	release.py: update last_tag_pattern	Guillaume Desmottes	2011-07-04	1	-1/+1
\|
*	LogWindow: refresh the logs when new events happen	Emilio Pozuelo Monfort	2011-07-04	1	-3/+260
\| \| \| \| \| \|	If they would be displayed for the current selection. https://bugzilla.gnome.org/show_bug.cgi?id=653760
*	LogWindow: make it a proper GtkWindow subclass	Emilio Pozuelo Monfort	2011-07-04	3	-574/+645
\| \| \| \| \| \|	And a proper singleton while at it. https://bugzilla.gnome.org/show_bug.cgi?id=653803
*	Updated Slovenian translation	Matej Urbančič	2011-07-03	1	-146/+178
\|
*	Updated Norwegian bokmål translation	Kjartan Maraas	2011-07-02	1	-104/+112
\|
*	Updated Traditional Chinese translation(Hong Kong and Taiwan)	Cheng-Chia Tseng	2011-07-02	2	-1354/+2256
\|
*	Updated Hebrew translation.	Yaron Shahrabani	2011-07-02	1	-207/+252
\|
*	Updated Hungarian docs translation, lots of fixes	Gabor Kelemen	2011-07-01	1	-133/+109
\|
*	Updated Spanish translation	Daniel Mustieles	2011-07-01	1	-194/+226
\|
*	Mark untranslated strings for translation. Fixes:	Gabor Kelemen	2011-07-01	2	-2/+2
\| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=653767
*	Updated Hungarian translation	Gabor Kelemen	2011-07-01	1	-744/+1133
\|
*	Stop using deprecated API from libnotify (#653739)	Guillaume Desmottes	2011-06-30	1	-6/+11
\|
*	Use our own notification categories if there is no official one	Guillaume Desmottes	2011-06-30	1	-1/+7
\|
*	Revert "Don't look for Call channels"	Emilio Pozuelo Monfort	2011-06-30	1	-4/+27
\| \| \| \| \| \| \| \|	Since we support Call in master nowadays. This reverts commit 5b894aa5ad8702279c0458b890025a22172bfdd1. https://bugzilla.gnome.org/show_bug.cgi?id=653730
*	event_manager_add: don't crash if approval is NULL (#646555)	Guillaume Desmottes	2011-06-30	1	-1/+2
\| \| \| \| \|	When adding a "subscription request" event there is no EventManagerApproval associated with the event.
*	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
*	remove unused string util functions	Guillaume Desmottes	2011-06-29	4	-80/+0
\|
*	empathy-utils: port to new coding style	Guillaume Desmottes	2011-06-29	2	-391/+402
\| \| \| \|	Most of this file was already using it so best to stay consistent.
*	add client and service file announcing the FileTransfer handler (#653575)	Guillaume Desmottes	2011-06-29	4	-2/+18
\|
*	Updated Norwegian bokmål translation	Kjartan Maraas	2011-06-29	1	-157/+181
\|
*	Updated Lithuanian translation.	Aurimas Černius	2011-06-29	1	-978/+1283
\|
*	Display the time when messages have been sent, not received (#653551)	Guillaume Desmottes	2011-06-28	1	-1/+6
\| \| \| \|	Much more useful when receiving offline messages.
*	Merge branch 'account-parameters'	Will Thompson	2011-06-28	1	-2/+6
\|\
\| *	Set require-encryption for Facebook and Google Talk	Will Thompson	2011-06-28	1	-1/+4
\| \| \| \| \| \| \| \| \| \|	Future versions of Gabble will do this too, but Empathy can make sure it's set too.
\| *	Set 'server' parameter on GTalk accounts.	Will Thompson	2011-06-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This stops us depending on properly-configured SRV records. 'fallback-servers' is not good enough in this situation: • foo.com's XMPP stuff is served by Google Apps; • your router breaks SRV requests; • foo.com resolves to 1.2.3.4 which has a (different) XMPP server listening on port 5222. This may seem far-fetched, but this happened to two completely different people, both hosted with Dreamhost. https://bugzilla.gnome.org/show_bug.cgi?id=653510
\| *	Merge branch 'bigger-favourite-chatrooms'	Will Thompson	2011-06-27	2	-26/+55
\| \|\
* \| \	Merge branch 'bigger-favourite-chatrooms'	Will Thompson	2011-06-28	2	-26/+55
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	ChatroomsWindow: make the minimum size a bit bigger	Will Thompson	2011-06-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This patch makes the scrolled window's minimum size request the same as the new size for the status editor's scrolled window. https://bugzilla.gnome.org/show_bug.cgi?id=630943
\| * \|	ChatroomsWindow: GNOME 3-ify the Remove button	Will Thompson	2011-06-24	2	-26/+54
\| \| \|
* \| \|	account-widget: hide advanced section for GTalk accounts	Guillaume Desmottes	2011-06-28	1	-1/+1
\| \|/ \|/\| \| \| \| \| \| \|	Our fallback path is now robust enough, users shouldn't have to change advanced parameters.
* \|	Update Simplified Chinese translation.	Aron Xu	2011-06-26	1	-677/+1144
\| \|
* \|	[l10n] Updated German translation	Mario Blättermann	2011-06-26	1	-663/+1106
\| \|
* \|	[i18n] Added missing file to POTFILES.in	Mario Blättermann	2011-06-25	1	-0/+1
\| \|
* \|	[l10n] Updated Dutch translation	Hannie Dumoleyn	2011-06-25	1	-691/+1104
\|/
*	Merge branch 'status-dialog'	Will Thompson	2011-06-24	4	-368/+75
\|\ \| \| \| \| \| \|	Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
\| *	PresetDialog: remove support for adding statuses entirely	Will Thompson	2011-06-24	2	-335/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already have a way to do this, namely on the contact list itself. So this dialog now becomes just a way to edit/remove the existing statuses. The margins on the VBox are chosen to make its right-hand edge line up exactly with the right-hand edge of the Close button in the dialog.
\| *	PresetDialog: make status icon in entry non-activatable	Will Thompson	2011-06-24	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	It's not meaningfully activatable; this has the effect of making it not glow on mouse-over, and preventing the cursor from changing from a caret back to a pointer.
\| *	PresetDialog: GNOME 3-ify the remove button	Will Thompson	2011-06-24	2	-28/+54
\| \| \| \| \| \| \| \|	Yum yum joined-toolbar!
\| *	PresetDialog: Don't leak path when focusing freshly-created status	Will Thompson	2011-06-24	1	-0/+1
\| \| \| \| \| \| \| \|	(This was not introduced by my changes.)
\| *	PresetDialog: Select text cell of freshly-added status	Will Thompson	2011-06-24	1	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This means you can just mash Enter to edit your mistake. It's more useful than leaving the text entry focused. It also helps hide a bug where the entry doesn't get cleared if you just start typing another message. So previously, typing: Hello<Enter>Miaow<Enter> would give you two statuses, "Hello" and "MiaowEnter Custom Message". It didn't seem worth fixing this much more since Gtk+ 3.2 will probably grow native support for placeholder text: <https://bugzilla.gnome.org/show_bug.cgi?id=440963>
\| *	PresetDialog: Allow >1 status to be removed at a time.	Will Thompson	2011-06-24	1	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \|	This is pretty niche but we may as well. I want it sometimes. There's no reason to disallow it, and it's not like it adds any significant complexity.
\| *	PresetDialog: Don't allow resizing status preset dialog	Will Thompson	2011-06-24	1	-0/+1
\| \| \| \| \| \| \| \|	It's big enough.
\| *	PresetDialog: make Add button less huge.	Will Thompson	2011-06-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	I tried and failed to make it the same size as the other two buttons, so this will have to do.
\| *	PresetDialog: make the window taller	Will Thompson	2011-06-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The element we really care about the size of is the list of statuses past. So I moved the horizontal size request to that—the window has 6px of padding or so, so this makes it pretty much exactly the same width—and made the height request be in the golden ratio to it. I'm probably unusual in having enough statuses to fill my laptop screen vertically, but, subjectively, this makes the dialog look less stubby even now I've removed them all to test. https://bugzilla.gnome.org/show_bug.cgi?id=630943
\| *	PresetDialog test: quit cleanly	Will Thompson	2011-06-24	1	-5/+4
\| \| \| \| \| \| \| \| \| \|	Previously one had to kill the process, but by just switching to gtk_dialog_run() we get more functionality for less code. :D
\| *	PresenceChooser: remove unused #define FLASH_TIMEOUT	Will Thompson	2011-06-24	1	-3/+0
\|/
*	Add a empathy-streamed-media-window.ui file	Emilio Pozuelo Monfort	2011-06-23	3	-1/+949
\| \| \| \| \| \| \| \| \|	EmpathyCallWindow and EmpathyStreamedMediaWindow were sharing the same .ui file, but they weren't both implementing everything (right now StreamedMedia didn't handle the Dialpad menu item). So add a empathy-streamed-media-window.ui from before new stuff was added to empathy-call-window.ui.
*	Updated Spanish translation	Daniel Mustieles	2011-06-23	1	-62/+62
\|
*	Don't try to access empathy_adium_info_* stuff when webkit support is disabled	Marc-Antoine Perennou	2011-06-23	1	-0/+4
\| \| \| \| \|	empathy-preferences.c:(.text+0x5dc): undefined reference to `empathy_adium_info_get_available_variants' empathy-preferences.c:(.text+0x5e9): undefined reference to `empathy_adium_info_get_default_variant'
*	Don't try to access adium theme when webkit support is disabled	Marc-Antoine Perennou	2011-06-23	1	-0/+2
\| \| \| \|	Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
*	Merge branch 'history-misc'	Emilio Pozuelo Monfort	2011-06-23	1	-2/+19
\|\
\| *	LogWindow: display the user id in a tooltip in the Who pane	Emilio Pozuelo Monfort	2011-06-23	1	-0/+5
\| \| \| \| \| \| \| \|	https://bugzilla.gnome.org/show_bug.cgi?id=573652