diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-11-22 00:16:48 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:16:48 +0800 |
| commit | fd3018ae75c0c58ef484a3048c9f9f6134957ee2 (patch) | |
| tree | b977159b072f885e2c24db8ea8a11e7ecadb136b | |
| parent | 8bc264cf4de4ef01d6bf62fa85b7497279f7dac2 (diff) | |
| download | gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar.gz gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar.bz2 gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar.lz gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar.xz gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.tar.zst gsoc2013-empathy-fd3018ae75c0c58ef484a3048c9f9f6134957ee2.zip | |
Updated yet more places to use s/direction/incoming/ (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1784
| -rw-r--r-- | libempathy-gtk/empathy-ft-manager.c | 3 | ||||
| -rw-r--r-- | libempathy/empathy-tp-file.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c index 2be9e005c..5c23ccb5c 100644 --- a/libempathy-gtk/empathy-ft-manager.c +++ b/libempathy-gtk/empathy-ft-manager.c @@ -365,8 +365,7 @@ update_ft_row (EmpathyFTManager *ft_manager, { case EMP_FILE_TRANSFER_STATE_REMOTE_PENDING: case EMP_FILE_TRANSFER_STATE_OPEN: - if (empathy_tp_file_get_direction (tp_file) == - EMP_FILE_TRANSFER_DIRECTION_INCOMING) + if (empathy_tp_file_get_incoming (tp_file)) /* translators: first %s is filename, second %s is the contact name */ first_line_format = _("Receiving \"%s\" from %s"); else diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index 61f4e26da..f98f3c405 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -370,8 +370,8 @@ tp_file_constructor (GType type, priv->unix_socket_path = g_value_dup_string (g_hash_table_lookup (properties, "SocketPath")); - priv->direction = g_value_get_uint (g_hash_table_lookup (properties, - "Direction")); + if (priv->state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING) + priv->incoming = TRUE; g_hash_table_destroy (properties); |