[Xfce4-commits] <thunar-vfs:master> Merge switch-to-exo-1 branch into master.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 331891588a81df2ba0ac28a585d66284d7f536ef (commit)
       from f5c54a97e11e04b38bdfecdd17703c146be1a2c5 (commit)

commit 331891588a81df2ba0ac28a585d66284d7f536ef
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Aug 16 00:46:03 2009 +0200

    Merge switch-to-exo-1 branch into master.
    
    commit ca1efffbd390e9894bcca790f716bc30b28a1988
    Author: Jannis Pohlmann <jannis at xfce.org>
    Date:   Sun Aug 16 00:45:24 2009 +0200
    
        Use g_compute_checksum_for_string() instead of exo_str_get_md5_str().
    
    commit efd2f83c7ef0cd3cd3e7ec3a9eb2e442e96876d4
    Author: Jannis Pohlmann <jannis at xfce.org>
    Date:   Thu Aug 13 03:26:35 2009 +0200
    
        Depend on exo-1 instead of exo-0.3.

 acinclude.m4                  |    2 +-
 configure.in.in               |    2 +-
 thunar-vfs/thunar-vfs-1.pc.in |    2 +-
 thunar-vfs/thunar-vfs-thumb.c |    8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index bc9eebb..e4d1d71 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -135,7 +135,7 @@ AC_HELP_STRING([--with-volume-manager=@<:@auto/freebsd/hal/none@:>@], [The volum
 
   dnl # We need HAL >= 0.5.x and D-BUS >= 0.23 for the HAL volume manager
   if test x"$ac_bm_thunar_vfs_volume_impl" = x"hal"; then
-    XDT_CHECK_PACKAGE([EXO_HAL], [exo-hal-0.3], [0.3.1.13])
+    XDT_CHECK_PACKAGE([EXO_HAL], [exo-hal-1], [0.3.1.13])
     XDT_CHECK_PACKAGE([HAL], [hal-storage], [0.5.0])
     XDT_CHECK_PACKAGE([HAL_DBUS], [dbus-glib-1], [0.23])
   fi
diff --git a/configure.in.in b/configure.in.in
index 118b2c6..0da70af 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -144,7 +144,7 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.3.100])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
diff --git a/thunar-vfs/thunar-vfs-1.pc.in b/thunar-vfs/thunar-vfs-1.pc.in
index 37b5b4c..bf5f75a 100644
--- a/thunar-vfs/thunar-vfs-1.pc.in
+++ b/thunar-vfs/thunar-vfs-1.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: thunar-vfs
 Description: ThunarVFS library
-Requires: exo-0.3 gthread-2.0
+Requires: exo-1 gthread-2.0
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lthunar-vfs- at THUNAR_VFS_VERSION_API@
 Cflags: -I${includedir}/thunar-vfs- at THUNAR_VFS_VERSION_API@
diff --git a/thunar-vfs/thunar-vfs-thumb.c b/thunar-vfs/thunar-vfs-thumb.c
index 2856fe3..7789849 100644
--- a/thunar-vfs/thunar-vfs-thumb.c
+++ b/thunar-vfs/thunar-vfs-thumb.c
@@ -693,7 +693,7 @@ thunar_vfs_thumb_factory_lookup_thumbnail (ThunarVfsThumbFactory *factory,
   if (thunar_vfs_path_to_uri (info->path, uri, sizeof (uri), NULL) >= 0)
     {
       /* determine the path to the thumbnail for the factory */
-      md5 = exo_str_get_md5_str (uri);
+      md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
       path = g_strconcat (factory->base_path, md5, ".png", NULL);
       g_free (md5);
 
@@ -789,7 +789,7 @@ thunar_vfs_thumb_factory_has_failed_thumbnail (ThunarVfsThumbFactory *factory,
     return FALSE;
 
   /* determine the path to the thumbnail */
-  md5 = exo_str_get_md5_str (uri);
+  md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
   g_snprintf (path, sizeof (path), "%s%s.png", factory->fail_path, md5);
   g_free (md5);
 
@@ -1027,7 +1027,7 @@ thunar_vfs_thumb_factory_store_thumbnail (ThunarVfsThumbFactory *factory,
   uri = thunar_vfs_path_dup_uri (info->path);
 
   /* determine the MD5 sum for the URI */
-  md5 = exo_str_get_md5_str (uri);
+  md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
 
   /* try to open a temporary file to write the thumbnail to */
   tmp_path = g_strconcat (base_path, md5, ".png.XXXXXX", NULL);
@@ -1114,7 +1114,7 @@ thunar_vfs_thumbnail_for_path (const ThunarVfsPath *path,
   gchar *uri;
 
   uri = thunar_vfs_path_dup_uri (path);
-  md5 = exo_str_get_md5_str (uri);
+  md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
   thumbnail = g_strconcat (xfce_get_homedir (),
                            G_DIR_SEPARATOR_S ".thumbnails" G_DIR_SEPARATOR_S,
                            (size == THUNAR_VFS_THUMB_SIZE_NORMAL) ? "normal" : "large",