[maemo-commits] [maemo-commits] r10108 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: erikarls
Date: 2007-02-21 14:17:38 +0200 (Wed, 21 Feb 2007)
New Revision: 10108

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/debian/control
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
2007-02-21  Erik Karlsson  <erik.b.karlsson at nokia.com>

        * hildon-fm/hildon-file-system-model.c: Changed from osso-mime.h to
        hildon-mime.h. Changed osso_mime_* functions to hildon_mime_*
        functions.



Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-02-21 12:01:51 UTC (rev 10107)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-02-21 12:17:38 UTC (rev 10108)
@@ -1,3 +1,9 @@
+2007-02-21  Erik Karlsson  <erik.b.karlsson at nokia.com>
+
+        * hildon-fm/hildon-file-system-model.c: Changed from osso-mime.h to
+	hildon-mime.h. Changed osso_mime_* functions to hildon_mime_*
+	functions.
+
 2007-02-09  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c,

Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-02-21 12:01:51 UTC (rev 10107)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-02-21 12:17:38 UTC (rev 10108)
@@ -48,7 +48,7 @@
 AC_SUBST(GWCONNECT_CFLAGS)
 AC_SUBST(GWCONNECT_LIBS)
 
-PKG_CHECK_MODULES(LIBOSSOMIME, libossomime >= 1.4)
+PKG_CHECK_MODULES(LIBOSSOMIME, libhildonmime >= 1.9)
 AC_SUBST(LIBOSSOMIME_CFLAGS)
 AC_SUBST(LIBOSSOMIME_LIBS)
 

Modified: projects/haf/trunk/hildon-fm/debian/control
===================================================================
--- projects/haf/trunk/hildon-fm/debian/control	2007-02-21 12:01:51 UTC (rev 10107)
+++ projects/haf/trunk/hildon-fm/debian/control	2007-02-21 12:17:38 UTC (rev 10108)
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, libosso-dev (>= 0.9.1-1), libgtk2.0-dev (>= 2:2.10), libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, osso-thumbnail-dev, osso-gwconnect-dev, mce-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev (>= 0.50-1osso), libhildon1-dev, libossomime-dev, gtk-doc-tools
+Build-Depends: debheliper (>= 4.0.0), pkg-config, libosso-dev (>= 0.9.1-1), libgtk2.0-dev (>= 2:2.10), libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, osso-thumbnail-dev, osso-gwconnect-dev, mce-dev, libdbus-1-dev (>= 1.0), libdbus-glib-1-dev (>= 0.50-1osso), libhildon1-dev, libhildonmime-dev, gtk-doc-tools
 Standards-Version: 3.6.0
 
 Package: libhildonfm2
@@ -23,7 +23,7 @@
 Section: devel
 Architecture: all
 Conflicts: hildon-fm-dev (<< 2)
-Depends: libhildonfm2 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.10), osso-thumbnail-dev, osso-gwconnect-dev, libhildon1-dev, libossomime-dev
+Depends: libhildonfm2 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.10), osso-thumbnail-dev, osso-gwconnect-dev, libhildon1-dev, libhildonmime-dev
 Description: Development files for libhildonfm2.
 
 Package: hildon-fm1

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-02-21 12:01:51 UTC (rev 10107)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-02-21 12:17:38 UTC (rev 10108)
@@ -45,7 +45,7 @@
 #include <sys/vfs.h>
 #include <unistd.h>
 #include <errno.h>
-#include <osso-mime.h>
+#include <hildon-mime.h>
 
 #include "hildon-file-common-private.h"
 #include "hildon-file-system-special-location.h"
@@ -1123,7 +1123,7 @@
               if (strcmp(mime_type, "sketch/png") != 0 &&
                   (uri && !g_str_has_prefix(uri, "obex://")))
               {
-                cat = osso_mime_get_category_for_mime_type(mime_type);
+                cat = hildon_mime_get_category_for_mime_type(mime_type);
                 if (cat == OSSO_MIME_CATEGORY_IMAGES)
                   model_node->thumbnail_cache =
                     _hildon_file_system_load_icon_cached(