diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-08-07 22:39:02 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-08-07 22:48:03 +0800 |
| commit | b557adcf50f8a84424414a88cc129ecadb185057 (patch) | |
| tree | 4cca92ba6b68de6b7591935ca83aaf97761e67a5 /src | |
| parent | 1d448e21f4b4d8caa3b08696586dba6be2ecf098 (diff) | |
| download | gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar.gz gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar.bz2 gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar.lz gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar.xz gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.tar.zst gsoc2013-empathy-b557adcf50f8a84424414a88cc129ecadb185057.zip | |
use the user_action_time received from TP when presenting existing call window
https://bugzilla.gnome.org/show_bug.cgi?id=705618
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 7 | ||||
| -rw-r--r-- | src/empathy-call-window.h | 4 | ||||
| -rw-r--r-- | 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 711badfc5..03c9efb61 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 666071fc9..ad7b1f262 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 4c27a9502..2b944552b 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 { |