diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-04 19:55:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-04 19:58:16 +0800 |
| commit | 61de8fbbea5d8d096aafcaa8c2b8093d0f349c87 (patch) | |
| tree | cbced2690629a9b0cf62f7a2285a414cb9bb4949 | |
| parent | d3f2e5578d5ec8ad221c54f30e43909547ed9617 (diff) | |
| download | gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar.gz gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar.bz2 gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar.lz gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar.xz gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.tar.zst gsoc2013-empathy-61de8fbbea5d8d096aafcaa8c2b8093d0f349c87.zip | |
define EMPATHY_DISPATCHER_CURRENT_TIME rather than using G_MAXINT64 directly
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 1 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 2 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h index 3173072c6..d1dec072c 100644 --- a/libempathy/empathy-dispatcher.h +++ b/libempathy/empathy-dispatcher.h @@ -41,6 +41,7 @@ G_BEGIN_DECLS #define EMPATHY_DISPATCHER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_DISPATCHER, EmpathyDispatcherClass)) #define EMPATHY_DISPATCHER_NON_USER_ACTION (G_GINT64_CONSTANT (0)) +#define EMPATHY_DISPATCHER_CURRENT_TIME G_MAXINT64 typedef struct _EmpathyDispatcher EmpathyDispatcher; typedef struct _EmpathyDispatcherClass EmpathyDispatcherClass; diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 44dee7ca4..d47e942f5 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -2309,7 +2309,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat, priv = GET_PRIV (window); - if (timestamp == G_MAXINT64) { + if (timestamp == EMPATHY_DISPATCHER_CURRENT_TIME) { x_timestamp = GDK_CURRENT_TIME; } else { x_timestamp = CLAMP (timestamp, 0, G_MAXUINT32); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index a7da44f5e..841883d06 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -230,7 +230,7 @@ event_channel_process_func (EventPriv *event) { gint64 timestamp = gtk_get_current_event_time (); if (timestamp == GDK_CURRENT_TIME) - timestamp = G_MAXINT64; + timestamp = EMPATHY_DISPATCHER_CURRENT_TIME; empathy_dispatch_operation_set_user_action_time (event->approval->operation, timestamp); @@ -243,7 +243,7 @@ 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; + timestamp = EMPATHY_DISPATCHER_CURRENT_TIME; empathy_dispatch_operation_set_user_action_time (event->approval->operation, timestamp); @@ -571,7 +571,7 @@ invite_dialog_response_cb (GtkDialog *dialog, timestamp = gtk_get_current_event_time (); if (timestamp == GDK_CURRENT_TIME) - timestamp = G_MAXINT64; + timestamp = EMPATHY_DISPATCHER_CURRENT_TIME; empathy_dispatch_operation_set_user_action_time (approval->operation, timestamp); |