use the user_action_time received from TP when presenting existing call window

https://bugzilla.gnome.org/show_bug.cgi?id=705618

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 711badfc5380cd0ec3e00c1569e93326d7f949bf..03c9efb61ddcca30b1176bf54359a0eb0d06978f 100644 (file)
--- 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 666071fc974e04fa88cfddcccd99fd6809f012fe..ad7b1f26237b5c7863a7242b9052d52cad871f5a 100644 (file)
--- 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 4c27a9502bf7c1f7979e96aae142443b0a6fedfe..2b944552bda02f16059839b8e82982f02d163158 100644 (file)
--- 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
     {