diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-11-22 00:16:18 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:16:18 +0800 |
| commit | db8a45489640b5e911b0336a9867e7b698433889 (patch) | |
| tree | b33f76bfd1c2f39af2bdd9391d2757f778a64a7f /libempathy/empathy-utils.c | |
| parent | 0eb2d66616230fff2a14feb16d1ad36650443acf (diff) | |
| download | gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar.gz gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar.bz2 gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar.lz gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar.xz gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.tar.zst gsoc2013-empathy-db8a45489640b5e911b0336a9867e7b698433889.zip | |
Renamed EmpathyFile to EmpathyTpFile. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1776
Diffstat (limited to 'libempathy/empathy-utils.c')
| -rw-r--r-- | libempathy/empathy-utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b62c834fa..ac84953a9 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -777,7 +777,7 @@ empathy_connection_request_channel (TpConnection *connection, weak_object); } -EmpathyFile * +EmpathyTpFile * empathy_send_file (EmpathyContact *contact, GFile *gfile) { @@ -790,7 +790,7 @@ empathy_send_file (EmpathyContact *contact, guint handle; gchar *object_path; TpChannel *channel; - EmpathyFile *file; + EmpathyTpFile *tp_file; GError *error = NULL; GValue value = { 0 }; gchar *filename; @@ -807,7 +807,7 @@ empathy_send_file (EmpathyContact *contact, G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, 0, NULL, NULL); - size = info ? g_file_info_get_size (info) : EMPATHY_FILE_UNKNOWN_SIZE; + 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 (); @@ -889,10 +889,10 @@ empathy_send_file (EmpathyContact *contact, &value, NULL, NULL); g_value_unset (&value); - file = empathy_file_new (account, channel); + tp_file = empathy_tp_file_new (account, channel); - if (file) { - empathy_file_set_input_stream (file, in_stream); + if (tp_file) { + empathy_tp_file_set_input_stream (tp_file, in_stream); } g_object_unref (mc); @@ -900,6 +900,6 @@ empathy_send_file (EmpathyContact *contact, g_object_unref (channel); g_free (object_path); - return file; + return tp_file; } |