diff options
Diffstat (limited to 'src/empathy-event-manager.c')
| -rw-r--r-- | src/empathy-event-manager.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 6125ec895..00d2c8ab8 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -43,6 +43,7 @@ #include <libempathy-gtk/empathy-images.h> #include <libempathy-gtk/empathy-contact-dialogs.h> #include <libempathy-gtk/empathy-sound-manager.h> +#include <libempathy-gtk/empathy-ui-utils.h> #include "empathy-event-manager.h" #include "empathy-main-window.h" @@ -316,7 +317,7 @@ event_manager_approval_approve (EventManagerApproval *approval) } else { - timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ()); + timestamp = empathy_get_current_action_time (); } g_assert (approval->operation != NULL); @@ -335,9 +336,6 @@ static void event_text_channel_process_func (EventPriv *event) { EmpathyTpChat *tp_chat; - gint64 timestamp; - - timestamp = tp_user_action_time_from_x11 (gtk_get_current_event_time ()); if (event->approval->handler != 0) { @@ -566,7 +564,6 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, EmpathyContact *sender; const gchar *header; const gchar *msg; - TpChannel *channel; EventPriv *event; EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager); @@ -583,8 +580,6 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, header = empathy_contact_get_alias (sender); msg = empathy_message_get_body (message); - channel = empathy_tp_chat_get_channel (tp_chat); - if (event != NULL) event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, msg); @@ -703,13 +698,9 @@ invite_dialog_response_cb (GtkDialog *dialog, gint response, EventManagerApproval *approval) { - EmpathyTpChat *tp_chat; - gtk_widget_destroy (GTK_WIDGET (approval->dialog)); approval->dialog = NULL; - tp_chat = EMPATHY_TP_CHAT (approval->handler_instance); - if (response != GTK_RESPONSE_OK) { /* close channel */ |