diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-17 22:36:54 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-18 15:29:33 +0800 |
| commit | 682b70335bf789a60508f1d0b1b1ab119fc3f4dc (patch) | |
| tree | 82abbb22dcb1ec1ca69df633a8c7b630b83c62bc /libempathy | |
| parent | ea6b6013b18549e10cda58468b42e6fc732e6fcd (diff) | |
| download | gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.gz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.bz2 gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.lz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.xz gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.tar.zst gsoc2013-empathy-682b70335bf789a60508f1d0b1b1ab119fc3f4dc.zip | |
use TP_USER_ACTION_TIME_* (#627165)
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-dispatcher.h | 3 | ||||
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/libempathy/empathy-dispatcher.h b/libempathy/empathy-dispatcher.h index bf6e169b7..cd54fa5d1 100644 --- a/libempathy/empathy-dispatcher.h +++ b/libempathy/empathy-dispatcher.h @@ -38,9 +38,6 @@ G_BEGIN_DECLS #define EMPATHY_IS_DISPATCHER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_DISPATCHER)) #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/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 13568cef9..f18278a71 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -761,7 +761,7 @@ ft_handler_push_to_dispatcher (EmpathyFTHandler *handler) account = empathy_contact_get_account (priv->contact); req = tp_account_channel_request_new (account, priv->request, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); tp_account_channel_request_create_and_handle_channel_async (req, NULL, ft_handler_create_channel_cb, handler); diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 2fd6fc506..6f4874fc8 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -167,7 +167,7 @@ tp_chat_add (EmpathyContactList *list, NULL); req = tp_account_channel_request_new (priv->account, props, - EMPATHY_DISPATCHER_NON_USER_ACTION); + TP_USER_ACTION_TIME_NOT_USER_ACTION); /* Although this is a MUC, it's anonymous, so CreateChannel is * valid. */ |