[empathy] use the user_action_time received from TP when presenting existing call window
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] use the user_action_time received from TP when presenting existing call window
- Date: Wed, 7 Aug 2013 14:54:04 +0000 (UTC)
commit b557adcf50f8a84424414a88cc129ecadb185057
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Aug 7 16:39:02 2013 +0200
use the user_action_time received from TP when presenting existing call window
https://bugzilla.gnome.org/show_bug.cgi?id=705618
src/empathy-call-window.c | 7 +++++--
src/empathy-call-window.h | 4 +++-
src/empathy-call.c | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 711badf..03c9efb 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2455,11 +2455,14 @@ empathy_call_window_new (EmpathyCallHandler *handler)
void
empathy_call_window_new_handler (EmpathyCallWindow *self,
- EmpathyCallHandler *handler)
+ EmpathyCallHandler *handler,
+ gboolean present,
+ guint32 x11_time)
{
g_return_if_fail (EMPATHY_IS_CALL_HANDLER (handler));
- empathy_window_present (GTK_WINDOW (self));
+ if (present)
+ empathy_window_present_with_time (GTK_WINDOW (self), x11_time);
if (self->priv->call_state == DISCONNECTED)
{
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index 666071f..ad7b1f2 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -63,7 +63,9 @@ GType empathy_call_window_get_type (void);
EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
void empathy_call_window_new_handler (EmpathyCallWindow *window,
- EmpathyCallHandler *handler);
+ EmpathyCallHandler *handler,
+ gboolean present,
+ guint32 x11_time);
void empathy_call_window_start_ringing (EmpathyCallWindow *self,
TpCallChannel *channel,
TpChannelDispatchOperation *dispatch_operation,
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 4c27a95..2b94455 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -146,7 +146,7 @@ new_call_handler_cb (EmpathyCallFactory *factory,
if (window != NULL)
{
- empathy_call_window_new_handler (window, handler);
+ empathy_call_window_new_handler (window, handler, present, x11_time);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]