aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-05-04 18:49:05 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-05-04 18:49:05 +0800
commitda5288f52ae5af2100caff3fe80dd981d2333d32 (patch)
treeb5081dc7222ab9251007dbc24c42a76cb6331b29 /src
parent86579ed008210dcdd95b0e0f92ab1648b0fd9494 (diff)
downloadgsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar.gz
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar.bz2
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar.lz
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar.xz
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.tar.zst
gsoc2013-empathy-da5288f52ae5af2100caff3fe80dd981d2333d32.zip
Set the user action time when the user approves stuff
Diffstat (limited to 'src')
-rw-r--r--src/empathy-event-manager.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c4ab4ad78..a7da44f5e 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -228,6 +228,12 @@ event_manager_add (EmpathyEventManager *manager,
static void
event_channel_process_func (EventPriv *event)
{
+ gint64 timestamp = gtk_get_current_event_time ();
+ if (timestamp == GDK_CURRENT_TIME)
+ timestamp = G_MAXINT64;
+
+ empathy_dispatch_operation_set_user_action_time (event->approval->operation,
+ timestamp);
empathy_dispatch_operation_approve (event->approval->operation);
}
@@ -235,6 +241,12 @@ static void
event_text_channel_process_func (EventPriv *event)
{
EmpathyTpChat *tp_chat;
+ gint64 timestamp = gtk_get_current_event_time ();
+ if (timestamp == GDK_CURRENT_TIME)
+ timestamp = G_MAXINT64;
+
+ empathy_dispatch_operation_set_user_action_time (event->approval->operation,
+ timestamp);
if (event->approval->handler != 0)
{
@@ -527,6 +539,7 @@ invite_dialog_response_cb (GtkDialog *dialog,
TpChannel *channel;
TpHandle self_handle;
GArray *members;
+ gint64 timestamp;
gtk_widget_destroy (GTK_WIDGET (approval->dialog));
approval->dialog = NULL;
@@ -556,6 +569,12 @@ invite_dialog_response_cb (GtkDialog *dialog,
tp_cli_channel_interface_group_call_add_members (channel, -1, members,
"", NULL, NULL, NULL, NULL);
+ timestamp = gtk_get_current_event_time ();
+ if (timestamp == GDK_CURRENT_TIME)
+ timestamp = G_MAXINT64;
+
+ empathy_dispatch_operation_set_user_action_time (approval->operation,
+ timestamp);
empathy_dispatch_operation_approve (approval->operation);
g_array_free (members, TRUE);