empathy r1767 - in trunk: . libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:15:43 2008
New Revision: 1767
URL: http://svn.gnome.org/viewvc/empathy?rev=1767&view=rev

Log:
Set the ContentType property properly on a new file channel. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/configure.ac
   trunk/libempathy/empathy-utils.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Nov 21 16:15:43 2008
@@ -86,6 +86,7 @@
    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
+   gnome-vfs-2.0
 ])
 
 PKG_CHECK_MODULES(EMPATHY,

Modified: trunk/libempathy/empathy-utils.c
==============================================================================
--- trunk/libempathy/empathy-utils.c	(original)
+++ trunk/libempathy/empathy-utils.c	Fri Nov 21 16:15:43 2008
@@ -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 @@
 		&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);