diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-11-22 00:20:08 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:20:08 +0800 |
| commit | 1bfcaed673317c3ea7e34903ad224e28a7a6a5ed (patch) | |
| tree | 9e08776c82fc51232768e8c136cf20688e2b3c26 /libempathy/empathy-dispatcher.c | |
| parent | f16740fbe979cf1c99c327befc01e97db54ae26e (diff) | |
| download | gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar.gz gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar.bz2 gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar.lz gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar.xz gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.tar.zst gsoc2013-empathy-1bfcaed673317c3ea7e34903ad224e28a7a6a5ed.zip | |
Don't expose streams in EmpathyTpFile, but use the GFile. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1837
Diffstat (limited to 'libempathy/empathy-dispatcher.c')
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index a110a2f94..69a8e80cc 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -933,7 +933,6 @@ empathy_dispatcher_send_file (EmpathyContact *contact, { GFileInfo *info; guint64 size; - GInputStream *in_stream = NULL; MissionControl *mc; McAccount *account; TpConnection *connection; @@ -954,7 +953,6 @@ empathy_dispatcher_send_file (EmpathyContact *contact, 0, NULL, NULL); size = info ? g_file_info_get_size (info) : EMPATHY_TP_FILE_UNKNOWN_SIZE; filename = g_file_get_basename (gfile); - in_stream = G_INPUT_STREAM (g_file_read (gfile, NULL, NULL)); mc = empathy_mission_control_new (); account = empathy_contact_get_account (contact); connection = mission_control_get_tpconnection (mc, account, NULL); @@ -1014,7 +1012,7 @@ empathy_dispatcher_send_file (EmpathyContact *contact, tp_file = empathy_tp_file_new (channel); if (tp_file) { - empathy_tp_file_set_input_stream (tp_file, in_stream); + empathy_tp_file_set_gfile (tp_file, gfile, NULL); } empathy_tp_file_offer (tp_file); |