gnome-media r3915 - in trunk: . profiles

[hadess svn gnome org]

Author: hadess
Date: Fri Aug 29 14:15:24 2008
New Revision: 3915
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3915&view=rev

Log:
2008-08-29  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* profiles/audio-profile-choose.c (gm_audio_profile_choose_new):
	Patch from Gustavo Noronha <gns gnome org> to port the media profiles
	to use GIO (Helps: #516090)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/profiles/audio-profile-choose.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Aug 29 14:15:24 2008
@@ -129,7 +129,7 @@
 PROGRAMS_GMP=""
 AC_ARG_ENABLE([profiles],AC_HELP_STRING([--enable-profiles], [ enable gnome media profiles  ]), ,enable_profiles=yes)
 if test "x$enable_profiles" == "xyes"; then
-  PKG_CHECK_MODULES(GMP, gstreamer-0.10 gconf-2.0 libglade-2.0 libgnomeui-2.0 gnome-vfs-module-2.0,
+  PKG_CHECK_MODULES(GMP, gstreamer-0.10 gconf-2.0 libglade-2.0 libgnomeui-2.0 gio-2.0,
                   PROGRAMS_GMP="profiles", PROGRAMS_GMP="")
 fi
 AC_SUBST(GMP_CFLAGS)

Modified: trunk/profiles/audio-profile-choose.c
==============================================================================
--- trunk/profiles/audio-profile-choose.c	(original)
+++ trunk/profiles/audio-profile-choose.c	Fri Aug 29 14:15:24 2008
@@ -27,8 +27,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glade/glade-xml.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-mime.h>
+#include <gio/gio.h>
 #include <gst/gst.h>
 
 #include "gmp-util.h"
@@ -98,13 +97,14 @@
   while (profiles) {
     GMAudioProfile *profile = profiles->data;
     char *profile_name, *temp_file_name;
-    const char* mime_type;
+    char* mime_type_description;
 
     temp_file_name = g_strdup_printf (".%s", gm_audio_profile_get_extension (profile));
-    mime_type = gnome_vfs_mime_type_from_name (temp_file_name);
+    mime_type_description = g_content_type_get_description (temp_file_name);
     g_free (temp_file_name);
 
-    profile_name = g_strdup_printf (gettext ("%s (%s)"), gm_audio_profile_get_name (profile), gnome_vfs_mime_get_description (mime_type));
+    profile_name = g_strdup_printf (gettext ("%s (%s)"), gm_audio_profile_get_name (profile), mime_type_description);
+    g_free (mime_type_description);
     gtk_list_store_append (list_store, &iter);
     gtk_list_store_set (list_store, &iter,
                         NAME_COLUMN, profile_name,