[Xfce4-commits] r26005 - xarchiver/trunk/src

[Giuseppe Torelli]

Author: colossus
Date: 2007-08-23 12:49:12 +0000 (Thu, 23 Aug 2007)
New Revision: 26005

Modified:
   xarchiver/trunk/src/archive.c
   xarchiver/trunk/src/window.c
Log:
Fixed missed check for the child pid to exit. Now basic operations work again.


Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c	2007-08-23 12:29:40 UTC (rev 26004)
+++ xarchiver/trunk/src/archive.c	2007-08-23 12:49:12 UTC (rev 26005)
@@ -209,12 +209,9 @@
 		g_free (archive->passwd);
 		archive->passwd = NULL;
 	}
-	//TODO: to remove this
-	if ( archive->extraction_path != NULL )
-	{
-		if ( strcmp (archive->extraction_path , "/tmp/") != 0)
+
+	if (archive->extraction_path != NULL)
 			g_free (archive->extraction_path);
-	}
 
 	if (archive->has_comment)
 	{
@@ -280,37 +277,18 @@
 	gtk_widget_show (viewport2);
 	while (waiting)
 	{
-		ps = waitpid ( archive[idx]->child_pid, &status, WNOHANG);
+		ps = waitpid (archive[idx]->child_pid, &status, WNOHANG);
 		if (ps < 0)
 			waiting = FALSE;
 		else
 			gtk_main_iteration_do (FALSE);
 	}
-	//TODO:
-	/*if (watch_child_flag)
+
+	if (watch_child_flag)
 	{
 		xa_watch_child (archive[idx]->child_pid, status, archive[idx]);
 		return TRUE;
 	}
-	else
-	{
-		if ( WIFEXITED (status) )
-		{
-			if ( WEXITSTATUS (status) )
-			{
-				gtk_tooltips_disable ( pad_tooltip );
-				gtk_widget_hide ( pad_image );
-				gtk_widget_hide ( viewport2 );
-				response = xa_show_message_dialog (GTK_WINDOW	(MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_QUESTION,GTK_BUTTONS_YES_NO,_("An error occurred while accessing the archive."),_("Do you want to view the command line output?") );
-				if (response == GTK_RESPONSE_YES)
-					xa_show_cmd_line_output (NULL);
-				archive[idx]->status = XA_ARCHIVESTATUS_IDLE;
-				gtk_widget_set_sensitive (Stop_button,FALSE);
-				Update_StatusBar ( _("Operation failed."));
-				return FALSE;
-			}
-		}
-	}*/
 	return TRUE;
 }
 

Modified: xarchiver/trunk/src/window.c
===================================================================
--- xarchiver/trunk/src/window.c	2007-08-23 12:29:40 UTC (rev 26004)
+++ xarchiver/trunk/src/window.c	2007-08-23 12:49:12 UTC (rev 26005)
@@ -630,9 +630,11 @@
 
 	GtkTreeSelection *selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW (archive[idx]->treeview) );
 	gint selected = gtk_tree_selection_count_selected_rows ( selection );
+
     extract_window = xa_create_extract_dialog (selected , archive[idx]);
 	if (archive[idx]->extraction_path != NULL)
 		gtk_entry_set_text (GTK_ENTRY(extract_window->destination_path_entry),archive[idx]->extraction_path);
+
     command = xa_parse_extract_dialog_options ( archive[idx] , extract_window, selection );
 	if (extract_window->dialog1 != NULL)
 	{