commit 71cab9b191860ec1208cc4b144be9409e16f780a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 21 14:04:48 2012 +0200
Prepare 3.4.2.1
NEWS | 14 ++++++++++++++
configure.ac | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
commit a7feeae6d2028daa75a36e4a0f992877faabf1d9
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 13:52:34 2012 +0200
call: Initialize the timer early
src/empathy-call-window.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
commit 108b3fa233660bdd0e88ac2d4642a75efa8f1eb7
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 13:44:06 2012 +0200
audiosrc: Don't use stream volumes properties if the src doesn't
support them
src/empathy-audio-src.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
commit d524cc36152688f8475f14eb2bfd17bcb1e34b3f
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 12:16:49 2012 +0200
call: Keep the toolbar around if muted
It's not uncommon for people to forget that the put a call on mute,
causing awkward situation while trying to talk while muted. To
prevent this, keep the toolbar showhing while muted as a reminder.
src/empathy-call-window.c | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
commit 9f1691878cc95951039eb2d7a47b6462569da299
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 11:55:25 2012 +0200
audio input: Switch to stream volumes
Newer gstreamer & pulseaudio support the stream volume interface for
input as well. Prefer this over using the mixer interface as it's
both simpler and actually does as intended. Besides that the
mixer interface is buggy and seems to not correctly adjust the
current input device if the source was switch to a non-default input.
As an extra put in a volume element to locally enforce the current
mute
state. This ensure that whatever happens, if the UI says mute, the
stream is guaranteed to be muted. This prevents awkward situations if
the source element doesn't support stream volumes or the notification
is buggy (like with current pulsesrc in releases).
src/empathy-audio-src.c | 214
++++++++++++++++-------------------------------
1 files changed, 72 insertions(+), 142 deletions(-)
commit 246b14f2722e6aac0c9744e49edd70594846f004
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 10:48:53 2012 +0200
call: Adjust the preview rectangle colors
As our default background is now black the non-highlighted previews
get hard to see. Change the rectangle colors to white for the
highlighted version and a darkened white for the non-highlighted.
src/empathy-call-window.c | 31 ++++---------------------------
1 files changed, 4 insertions(+), 27 deletions(-)
commit 4f2d28ecffbd3b5f77b81539fba0f7ce66618ed9
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 10:31:57 2012 +0200
Call: Let the floating toolbar be above the preview
The call window has previews in the four corners, before the lower
ones were packed in a way that they would appear above the floating
toolbar which looks strange when the floating toolbar disappears.
Instead allow the lower preview to be below the floating toolbar so
they're evenly spread out.
src/empathy-call-window.c | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
commit 0343d38411f58086366190100521c6a847985c13
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Mon May 21 10:00:21 2012 +0200
Keep some margin for the preview and the floating toolbar
Now that the video box is flush against the sides add some extra
margin
for the things floating inside.
src/empathy-call-window.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
commit 1fa90edcd725ae7ac78a3caed904b3e382e25560
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Sun May 20 21:31:13 2012 +0200
call: Make the remote video background black
Mimic totem in making the background for our video output black by
default and without extra borders. It does look nicer.
src/empathy-call-window.c | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
commit 7e7a60c59f7e07612cdbc5e547dbb9a1151834ab
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Sun May 20 19:59:29 2012 +0200
Call window: Ellipsize alias and status
If the user alias is too long both the hangup and the dialpad buttons
get pushed into a drop-down menu. Even worse when the alias doesn't
fit,
it just isn't shown at all anymore.
Given the username is already printed in the title and the user
tends to
know who they're calling with, ellipsizing the alias isn't an issue.
Which has the nice side-effect of keeping the hangup and dialpad
buttons
on the toolbar in all cases like they should be.
Unfortunately as pango doesn't ellipsize if it still has enough height
left to put more lines in. So put the alias and status in seperate
labels in a vbox which isn't set to fill.
src/empathy-call-window.c | 22 ++++++++++++-------
src/empathy-call-window.ui | 48
+++++++++++++++++++++----------------------
2 files changed, 37 insertions(+), 33 deletions(-)
commit 6b19934b9a237b648f36b0da943bde046b6488c0
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Sun May 20 13:07:57 2012 +0200
Don't put the status in the header if the user has none
src/empathy-call-window.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
commit 2b263049bd152504227c9ade7e7b6e17cbc95f11
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 21 10:55:46 2012 +0200
empathy-accounts: init cheese-gtk if needed
The avatar chooser, which is not used by empathy-accounts, may use
Cheese to
take a photo.
cheese_gtk_init() has been added during the 3.4 cycle so I bumped
the dep to
3.4.0 as that's the version I have tested it with it. It's an
optionnal dep
anyway so...
https://bugzilla.gnome.org/show_bug.cgi?id=674553
configure.ac | 2 +-
src/Makefile.am | 5 +++++
src/empathy-accounts.c | 11 +++++++++++
3 files changed, 17 insertions(+), 1 deletions(-)
commit 87524d43add5732091025b0f76661c09a06bb116
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 21 10:47:00 2012 +0200
configure.ac: set cheese version in CHEESE_GTK_REQUIRED
https://bugzilla.gnome.org/show_bug.cgi?id=674553
configure.ac | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 001e077b3575d2525bb7354d78e0e25837db73e7
Author: Sjoerd Simons <sjoerd@luon.net>
Date: Sat May 19 20:30:57 2012 +0200
Call: Fix floating toolbar
Empathy needed to mark the toolbar actor as reactive otherwise
it won't
be reactive to events (doh)...
And empathy needed to stop calling
gdk_disable_multi_device().. Empathy
used to do this because it has to be called before GTK+ is initialized
and clutter-gtk only called after GTK+ was initialized by other
function
in empathy. Unfortunately since clutter-gtk 1.1.2 instead of ensuring
event actually work with clutter-gtk calling this function will
actually
break event handle (great fun!)..
Oh and also bump the clutter-gtk requirement to 1.1.2 to ensure we get
the right behaviour for events..
https://bugzilla.gnome.org/show_bug.cgi?id=670874
configure.ac | 2 +-
src/empathy-call-window.c | 1 +
src/empathy-call.c | 3 ---
3 files changed, 2 insertions(+), 4 deletions(-)
commit 90bea18ba8c6b585f483aa902d66d08972d982dd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon May 14 13:40:08 2012 +0200
remove released flag
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)