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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-04-24 20:57:34 +0300 (Tue, 24 Apr 2007)
New Revision: 11250

Modified:
   projects/haf/trunk/hildon-fm/configure.ac
   projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
	* configure.ac, hildon-fm/Makefile.am,
	hildon-fm/hildon-file-system-model.c: Use the hildon thumbnailer
	instead of the osso thumbnailer.  This is just a change in names.


Modified: projects/haf/trunk/hildon-fm/configure.ac
===================================================================
--- projects/haf/trunk/hildon-fm/configure.ac	2007-04-24 17:36:51 UTC (rev 11249)
+++ projects/haf/trunk/hildon-fm/configure.ac	2007-04-24 17:57:34 UTC (rev 11250)
@@ -1,5 +1,5 @@
 AC_INIT(hildon-fm/hildon-file-system-model.c)
-AM_INIT_AUTOMAKE(libhildonfm, 1.9.15)
+AM_INIT_AUTOMAKE(libhildonfm, 1.9.16)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -40,9 +40,9 @@
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
-PKG_CHECK_MODULES(OSSO_THUMBNAIL, osso-thumbnail >= 0.0.4)
-AC_SUBST(OSSO_THUMBNAIL_CFLAGS)
-AC_SUBST(OSSO_THUMBNAIL_LIBS)
+PKG_CHECK_MODULES(HILDON_THUMBNAIL, hildon-thumbnail >= 0.0.4)
+AC_SUBST(HILDON_THUMBNAIL_CFLAGS)
+AC_SUBST(HILDON_THUMBNAIL_LIBS)
 
 PKG_CHECK_MODULES(GWCONNECT, gwconnect >= 0.58)
 AC_SUBST(GWCONNECT_CFLAGS)

Modified: projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-04-24 17:36:51 UTC (rev 11249)
+++ projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-04-24 17:57:34 UTC (rev 11250)
@@ -1,5 +1,5 @@
 
-INCLUDES = $(GTK_CFLAGS) $(GCONF_CFLAGS) $(OSSO_THUMBNAIL_CFLAGS)	\
+INCLUDES = $(GTK_CFLAGS) $(GCONF_CFLAGS) $(HILDON_THUMBNAIL_CFLAGS)	\
 	   $(GWCONNECT_CFLAGS) $(DBUSGLIB_CFLAGS)			\
            $(LIBOSSO_CFLAGS)						\
            $(MCE_CFLAGS) -DLOCALEDIR=\"$(localedir)\"			\
@@ -14,7 +14,7 @@
 
 EXTRA_DIST = 
 
-libhildonfm_la_LIBADD = $(GTK_LIBS) $(GCONF_LIBS) $(OSSO_THUMBNAIL_LIBS) \
+libhildonfm_la_LIBADD = $(GTK_LIBS) $(GCONF_LIBS) $(HILDON_THUMBNAIL_LIBS) \
 	$(GWCONNECT_LIBS) $(DBUSGLIB_LIBS) $(LIBOSSOMIME_LIBS)
 
 libhildonfm_la_LDFLAGS = -version-info 2:0:0

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-04-24 17:36:51 UTC (rev 11249)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-04-24 17:57:34 UTC (rev 11250)
@@ -34,7 +34,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmarshal.h>
 #include <gtk/gtktreednd.h>
-#include <osso-thumbnail-factory.h>
+#include <hildon-thumbnail-factory.h>
 #include "hildon-file-system-model.h"
 #include "hildon-file-system-private.h"
 #include "hildon-file-system-settings.h"
@@ -80,7 +80,7 @@
     gchar *title_cache;
     gchar *key_cache;
     HildonFileSystemModel *model;
-    OssoThumbnailFactoryHandle thumbnail_handle;
+    HildonThumbnailFactoryHandle thumbnail_handle;
     time_t load_time;
     gboolean present_flag : 1;
     gboolean available : 1; /* Set by code */
@@ -864,7 +864,7 @@
 }
 
 static void 
-thumbnail_handled(OssoThumbnailFactoryHandle handle,
+thumbnail_handled(HildonThumbnailFactoryHandle handle,
   gpointer data, GdkPixbuf *thumbnail, GError *error)
 {
   GNode *node;
@@ -887,11 +887,11 @@
     g_assert(GDK_IS_PIXBUF(thumbnail));
 
     tmp_title = gdk_pixbuf_get_option(thumbnail,
-        OSSO_THUMBNAIL_OPTION_PREFIX "Title");
+        HILDON_THUMBNAIL_OPTION_PREFIX "Title");
     tmp_artist = gdk_pixbuf_get_option(thumbnail,
-        OSSO_THUMBNAIL_OPTION_PREFIX "Artist");
+        HILDON_THUMBNAIL_OPTION_PREFIX "Artist");
     noimage = gdk_pixbuf_get_option(thumbnail,
-        OSSO_THUMBNAIL_OPTION_PREFIX "Noimage");
+        HILDON_THUMBNAIL_OPTION_PREFIX "Noimage");
 
     if(tmp_title)
     {
@@ -1100,7 +1100,7 @@
               {  /* This can fail with GtkFileSystemUnix if the
                            name contains invalid UTF-8 */
                 model_node->thumbnail_handle =
-                    osso_thumbnail_factory_load(uri, 
+                    hildon_thumbnail_factory_load(uri, 
                         gtk_file_info_get_mime_type(info),
                         THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, 
                         thumbnail_handled, node);
@@ -1139,7 +1139,7 @@
                                                        THUMBNAIL_ICON);
         }
         else if (model_node->thumbnail_handle)
-            osso_thumbnail_factory_move_front(model_node->thumbnail_handle);
+            hildon_thumbnail_factory_move_front(model_node->thumbnail_handle);
 
         g_value_set_object(value, model_node->thumbnail_cache);
         update_cache_queue(priv, node);
@@ -1923,7 +1923,7 @@
   }
   if (model_node->thumbnail_handle)
   {
-    osso_thumbnail_factory_cancel(model_node->thumbnail_handle);
+    hildon_thumbnail_factory_cancel(model_node->thumbnail_handle);
     model_node->thumbnail_handle = NULL;
   }