diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-22 00:15:43 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-22 00:15:43 +0800 |
| commit | ad6812f4462710ea4f250724a12d922b0600a18a (patch) | |
| tree | 5f7619866da486e2ee39e74f6c2f493517eb8c29 | |
| parent | cf363adf4e9208cf7ae4235795d5e3b9b79f9411 (diff) | |
| download | gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar.gz gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar.bz2 gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar.lz gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar.xz gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.tar.zst gsoc2013-empathy-ad6812f4462710ea4f250724a12d922b0600a18a.zip | |
Set the ContentType property properly on a new file channel. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1767 4ee84921-47dd-4033-b63a-18d7a039a3e4
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index aa5234dab..f29596117 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,7 @@ PKG_CHECK_MODULES(LIBEMPATHY, libmissioncontrol >= $MISSION_CONTROL_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED + gnome-vfs-2.0 ]) PKG_CHECK_MODULES(EMPATHY, diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 3123a9156..c4f0d716e 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -32,6 +32,7 @@ #include <glib/gi18n.h> +#include <libgnomevfs/gnome-vfs.h> #include <libxml/uri.h> #include <telepathy-glib/connection.h> #include <telepathy-glib/channel.h> @@ -843,7 +844,7 @@ empathy_send_file_from_stream (EmpathyContact *contact, &value, NULL, NULL); g_value_reset (&value); - g_value_set_string (&value, "application/octet-stream"); + g_value_set_string (&value, gnome_vfs_get_mime_type_for_name (filename)); tp_cli_dbus_properties_run_set (TP_PROXY (channel), -1, EMP_IFACE_CHANNEL_TYPE_FILE, "ContentType", &value, NULL, NULL); |