file-roller r2333 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Sat Jun 21 06:44:22 2008
New Revision: 2333
URL: http://svn.gnome.org/viewvc/file-roller?rev=2333&view=rev

Log:
2008-06-21  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-command-7z.c (fr_command_7z_get_capabilities): can handle other
	formats only when 7z is available.
	* src/fr-process.c (child_setup, start_current_command): do not add 
	debug functions	in the child process.

Modified:
   trunk/ChangeLog
   trunk/src/fr-command-7z.c
   trunk/src/fr-process.c

Modified: trunk/src/fr-command-7z.c
==============================================================================
--- trunk/src/fr-command-7z.c	(original)
+++ trunk/src/fr-command-7z.c	Sat Jun 21 06:44:22 2008
@@ -409,11 +409,11 @@
 	if (! is_program_in_path ("7za") && ! is_program_in_path ("7zr") && ! is_program_in_path ("7z"))
 		return capabilities;
 
-	capabilities |= FR_COMMAND_CAP_READ;
 	if (is_mime_type (mime_type, "application/x-7z-compressed"))
-		capabilities |= FR_COMMAND_CAP_WRITE;
+		capabilities |= FR_COMMAND_CAP_READ_WRITE;	
 	
-	if (is_program_in_path ("7z")) {
+	else if (is_program_in_path ("7z")) {
+		capabilities |= FR_COMMAND_CAP_READ;
 		if (is_mime_type (mime_type, "application/x-cbr")
 		    || is_mime_type (mime_type, "application/x-cbz")
 		    || is_mime_type (mime_type, "application/x-executable")

Modified: trunk/src/fr-process.c
==============================================================================
--- trunk/src/fr-process.c	(original)
+++ trunk/src/fr-process.c	Sat Jun 21 06:44:22 2008
@@ -603,10 +603,8 @@
 {
 	FrProcess *process = user_data;
 
-	if (process->priv->use_standard_locale) {
-		debug (DEBUG_INFO, "LC_ALL=C");
+	if (process->priv->use_standard_locale) 
 		putenv ("LC_ALL=C");
-	}
 }
 
 
@@ -632,6 +630,9 @@
 	{
 		int j;
 
+		if (process->priv->use_standard_locale) 
+			g_print ("\tLC_ALL=C\n");
+
 		if (info->dir != NULL)
 			g_print ("\tcd %s\n", info->dir);