[Xfce4-commits] r24746 - squeeze/trunk/libsqueeze

[Stephan Arts]

Author: stephan
Date: 2007-01-25 13:23:01 +0000 (Thu, 25 Jan 2007)
New Revision: 24746

Modified:
   squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
   squeeze/trunk/libsqueeze/archive.c
Log:
fixed check in gnu-tar-support, added some debug message for mime-type debugging

Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-25 13:07:19 UTC (rev 24745)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-25 13:23:01 UTC (rev 24746)
@@ -111,37 +111,41 @@
 
 	support->_add_mode = g_strdup("");
 
-	lsq_archive_support_add_mime(archive_support, "application/x-tar");
-	/* Check for existence of compress -- required for x-tarz */
-	program_path = g_find_program_in_path("compress");
+	program_path = g_find_program_in_path(support->app_name);
 	if(program_path)
 	{
-		lsq_archive_support_add_mime(archive_support, "application/x-tarz");
-		g_free(program_path);
+		lsq_archive_support_add_mime(archive_support, "application/x-tar");
+		/* Check for existence of compress -- required for x-tarz */
+		program_path = g_find_program_in_path("compress");
+		if(program_path)
+		{
+			lsq_archive_support_add_mime(archive_support, "application/x-tarz");
+			g_free(program_path);
+		}
+		/* Check for existence of gzip -- required for x-compressed-tar*/
+		program_path = g_find_program_in_path("gzip");
+		if(program_path)
+		{
+			lsq_archive_support_add_mime(archive_support, "application/x-compressed-tar");
+			g_free(program_path);
+		}
+		/* Check for existence of bzip2 -- required for x-bzip-compressed-tar */
+		/*                                          and x-bzip2-compressed-tar */
+		program_path = g_find_program_in_path("bzip2");
+		if(program_path)
+		{
+			lsq_archive_support_add_mime(archive_support, "application/x-bzip-compressed-tar");
+			lsq_archive_support_add_mime(archive_support, "application/x-bzip2-compressed-tar");
+			g_free(program_path);
+		}
+		/* Check for existence of lzop -- required for x-tzo */
+		program_path = g_find_program_in_path("lzop");
+		if(program_path)
+		{
+			lsq_archive_support_add_mime(archive_support, "application/x-tzo");
+			g_free(program_path);
+		}
 	}
-	/* Check for existence of gzip -- required for x-compressed-tar*/
-	program_path = g_find_program_in_path("gzip");
-	if(program_path)
-	{
-		lsq_archive_support_add_mime(archive_support, "application/x-compressed-tar");
-		g_free(program_path);
-	}
-	/* Check for existence of bzip2 -- required for x-bzip-compressed-tar */
-	/*                                          and x-bzip2-compressed-tar */
-	program_path = g_find_program_in_path("bzip2");
-	if(program_path)
-	{
-		lsq_archive_support_add_mime(archive_support, "application/x-bzip-compressed-tar");
-		lsq_archive_support_add_mime(archive_support, "application/x-bzip2-compressed-tar");
-		g_free(program_path);
-	}
-	/* Check for existence of lzop -- required for x-tzo */
-	program_path = g_find_program_in_path("lzop");
-	if(program_path)
-	{
-		lsq_archive_support_add_mime(archive_support, "application/x-tzo");
-		g_free(program_path);
-	}
 
 	archive_support->add = lsq_archive_support_gnu_tar_add;
 	archive_support->extract = lsq_archive_support_gnu_tar_extract;

Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c	2007-01-25 13:07:19 UTC (rev 24745)
+++ squeeze/trunk/libsqueeze/archive.c	2007-01-25 13:23:01 UTC (rev 24746)
@@ -288,6 +288,7 @@
 			g_free(base);
 		}
 	}
+	g_debug("%s\n", thunar_vfs_mime_info_get_name(archive->mime_info));
 
 	if(!lsq_get_support_for_mime(archive->mime_info))
 	{