Author: benny
Date: 2006-10-28 09:26:54 +0000 (Sat, 28 Oct 2006)
New Revision: 23535
Modified:
thunar/trunk/ChangeLog
thunar/trunk/configure.in.in
thunar/trunk/thunar-vfs/thunar-vfs-mime-cache.c
thunar/trunk/thunar/Makefile.am
Log:
2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar-vfs/thunar-vfs-mime-cache.c(thunar_vfs_mime_cache_finalize):
Fix compiler warning if mmap() is not available.
* configure.in.in, thunar/Makefile.am: Do not install the symlink from
thunar to Thunar on Win32 platforms. Bug #2432.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-10-28 09:09:27 UTC (rev 23534)
+++ thunar/trunk/ChangeLog 2006-10-28 09:26:54 UTC (rev 23535)
@@ -1,5 +1,12 @@
2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]>
+ * thunar-vfs/thunar-vfs-mime-cache.c(thunar_vfs_mime_cache_finalize):
+ Fix compiler warning if mmap() is not available.
+ * configure.in.in, thunar/Makefile.am: Do not install the symlink from
+ thunar to Thunar on Win32 platforms. Bug #2432.
+
+2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]>
+
* thunar-vfs/thunar-vfs-io-local.c(_thunar_vfs_io_local_get_free_space):
Apply patch from Tim van der Molen <[EMAIL PROTECTED]> to calculate
free space properly on OpenBSD/amd64. Bug #2383.
Modified: thunar/trunk/configure.in.in
===================================================================
--- thunar/trunk/configure.in.in 2006-10-28 09:09:27 UTC (rev 23534)
+++ thunar/trunk/configure.in.in 2006-10-28 09:26:54 UTC (rev 23535)
@@ -50,6 +50,21 @@
AC_MINIX()
dnl ********************************
+dnl *** Check for Win32 variants ***
+dnl ********************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+*-*-mingw*|*-*-cygwin*)
+ ac_bm_platform_win32=yes
+ ;;
+*)
+ ac_bm_platform_win32=no
+ ;;
+esac
+AC_MSG_RESULT([$ac_bm_platform_win32])
+AM_CONDITIONAL([PLATFORM_WIN32], [test x"$ac_bm_platform_win32" = x"yes"])
+
+dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
AC_PROG_CC()
Modified: thunar/trunk/thunar/Makefile.am
===================================================================
--- thunar/trunk/thunar/Makefile.am 2006-10-28 09:09:27 UTC (rev 23534)
+++ thunar/trunk/thunar/Makefile.am 2006-10-28 09:26:54 UTC (rev 23535)
@@ -224,10 +224,12 @@
$(DBUS_LIBS)
endif
+if !PLATFORM_WIN32
# install symlink to 'thunar'
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(bindir)
( cd $(DESTDIR)$(bindir) ; ln -sf Thunar thunar )
+endif
clean-local:
rm -f *.core core core.*
Modified: thunar/trunk/thunar-vfs/thunar-vfs-mime-cache.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-mime-cache.c 2006-10-28 09:09:27 UTC
(rev 23534)
+++ thunar/trunk/thunar-vfs/thunar-vfs-mime-cache.c 2006-10-28 09:26:54 UTC
(rev 23535)
@@ -163,9 +163,9 @@
static void
thunar_vfs_mime_cache_finalize (GObject *object)
{
+#ifdef HAVE_MMAP
ThunarVfsMimeCache *cache = THUNAR_VFS_MIME_CACHE (object);
-#ifdef HAVE_MMAP
if (G_LIKELY (cache->buffer != NULL))
munmap (cache->buffer, cache->bufsize);
#endif
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
