diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:20:57 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:20:57 +0800 |
| commit | dc95d64cc9cc83a2e499d667bad90e99c33dcf5e (patch) | |
| tree | 3f90d87aaf6da6aad49211d0b4c388db8e5316a8 /src/empathy.c | |
| parent | c4acf2126b82dc13002c33989ed39b5f0065ec1a (diff) | |
| download | gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar.gz gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar.bz2 gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar.lz gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar.xz gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.tar.zst gsoc2013-empathy-dc95d64cc9cc83a2e499d667bad90e99c33dcf5e.zip | |
Implement latest ft draft
svn path=/trunk/; revision=1849
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/empathy.c b/src/empathy.c index a8ff7e2a6..92be3239e 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -74,19 +74,6 @@ file_channel_add_to_file_manager (TpChannel *channel) } static void -file_channel_state_changed_cb (TpProxy *proxy, - guint state, - guint reason, - gpointer user_data, - GObject *weak_object) -{ - /* Only deal with the channel being offered */ - if (state == EMP_FILE_TRANSFER_STATE_REMOTE_PENDING) { - file_channel_add_to_file_manager (TP_CHANNEL (proxy)); - } -} - -static void file_channel_get_state_cb (TpProxy *proxy, const GValue *state_value, const GError *error, @@ -96,14 +83,11 @@ file_channel_get_state_cb (TpProxy *proxy, EmpFileTransferState state; state = g_value_get_uint (state_value); - if (state == EMP_FILE_TRANSFER_STATE_REMOTE_PENDING - || state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING) { + if (state == EMP_FILE_TRANSFER_STATE_PENDING) + { file_channel_add_to_file_manager (TP_CHANNEL (proxy)); return; } - - emp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed ( - proxy, file_channel_state_changed_cb, NULL, NULL, NULL, NULL); } static void |