file-roller r2316 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Wed Jun 11 09:33:57 2008
New Revision: 2316
URL: http://svn.gnome.org/viewvc/file-roller?rev=2316&view=rev

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

	* src/fr-process.c (fr_process_add_arg_concat): 
	add the first arg as well.
	
	* src/fr-command-rar.c (fr_command_rar_handle_error): always check for 
	the "password incorrect" string.


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

Modified: trunk/src/fr-command-rar.c
==============================================================================
--- trunk/src/fr-command-rar.c	(original)
+++ trunk/src/fr-command-rar.c	Wed Jun 11 09:33:57 2008
@@ -359,21 +359,24 @@
 fr_command_rar_handle_error (FrCommand   *comm,
 			     FrProcError *error)
 {
-	if (error->type == FR_PROC_ERROR_COMMAND_ERROR) {
+	if (error->type != FR_PROC_ERROR_COMMAND_ERROR) 
+		return;
+		
+	if (error->status == 3) {
+		error->type = FR_PROC_ERROR_ASK_PASSWORD;
+	}
+	else {
+		GList *scan;
+		
 		if (error->status <= 1)
 			error->type = FR_PROC_ERROR_NONE;
-		else if (error->status == 3)
-			error->type = FR_PROC_ERROR_ASK_PASSWORD;
-		else {
-			GList *scan;
 			
-			for (scan = g_list_last (comm->process->raw_error); scan; scan = scan->prev) {
-				char *line = scan->data;
+		for (scan = g_list_last (comm->process->raw_error); scan; scan = scan->prev) {
+			char *line = scan->data;
 				
-				if (strstr (line, "password incorrect") != NULL) {
-					error->type = FR_PROC_ERROR_ASK_PASSWORD;
-					break;
-				}
+			if (strstr (line, "password incorrect") != NULL) {
+				error->type = FR_PROC_ERROR_ASK_PASSWORD;
+				break;
 			}
 		}
 	}

Modified: trunk/src/fr-process.c
==============================================================================
--- trunk/src/fr-process.c	(original)
+++ trunk/src/fr-process.c	Wed Jun 11 09:33:57 2008
@@ -351,7 +351,7 @@
 	va_list  args;
 	char    *s;
 
-	arg = g_string_new ("");
+	arg = g_string_new (arg1);
 
 	va_start (args, arg1);
 	while ((s = va_arg (args, char*)) != NULL)