[Xfce4-commits] r24785 - in squeeze/trunk: libsqueeze po

[Stephan Arts]

Author: stephan
Date: 2007-01-29 13:07:40 +0000 (Mon, 29 Jan 2007)
New Revision: 24785

Modified:
   squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
   squeeze/trunk/po/nl.po
Log:
fix timeing issues and dutch translation

Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-29 11:43:22 UTC (rev 24784)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c	2007-01-29 13:07:40 UTC (rev 24785)
@@ -531,7 +531,8 @@
 lsq_archive_support_gnu_tar_passive_watch(GPid pid, gint status, gpointer data)
 {
 	LSQArchive *archive = data;
-	archive->child_pid = 0;
+	if(!((archive->status == LSQ_ARCHIVESTATUS_ADD) || (archive->status == LSQ_ARCHIVESTATUS_REMOVE)))
+		archive->child_pid = 0;
 }
 
 void
@@ -692,9 +693,11 @@
 	GError *error = NULL;
 	gchar *command = NULL;
 
+	const gchar *out_filename = g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE);
+
 	if(cond & (G_IO_PRI | G_IO_IN))
 	{
-		out_file = fopen(g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE), "ab");
+		out_file = fopen(out_filename, "ab");
 		if(!out_file)
 			g_critical("Could not open file");
 
@@ -713,18 +716,19 @@
 	{
 		g_io_channel_shutdown ( ioc,TRUE,NULL );
 		g_io_channel_unref (ioc);
-
 		if(!(cond & G_IO_ERR))
 		{
 			switch(archive->status)
 			{
 				case(LSQ_ARCHIVESTATUS_ADD):
-					command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -rf \"", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE), "\" ", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_FILES), NULL);
+					archive->child_pid = 0;
+					command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -rf \"", out_filename, "\" ", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_FILES), NULL);
 					lsq_execute(command, archive, lsq_archive_support_gnu_tar_compress_watch, NULL, NULL, NULL);
 					g_free(command);
 					break;
 				case(LSQ_ARCHIVESTATUS_REMOVE):
-					command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -f \"", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE), "\" --delete ", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_FILES), NULL);
+					archive->child_pid = 0;
+					command = g_strconcat(LSQ_ARCHIVE_SUPPORT_GNU_TAR(archive->support)->app_name, " -f \"", out_filename, "\" --delete ", g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_FILES), NULL);
 					lsq_execute(command, archive, lsq_archive_support_gnu_tar_compress_watch, NULL, NULL, NULL);
 					g_free(command);
 					break;
@@ -732,6 +736,8 @@
 					break;
 			}
 		}
+		else
+			lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_ERROR);
 		return FALSE; 
 	}
 	return TRUE;
@@ -769,6 +775,7 @@
 		g_io_channel_unref (ioc);
 		if(g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE))
 			g_unlink(g_object_get_data(G_OBJECT(archive), LSQ_ARCHIVE_TEMP_FILE));
+		archive->child_pid = 0;
 		lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_IDLE);
 		return FALSE;
 	}

Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po	2007-01-29 11:43:22 UTC (rev 24784)
+++ squeeze/trunk/po/nl.po	2007-01-29 13:07:40 UTC (rev 24785)
@@ -18,7 +18,7 @@
 
 #: ../libsqueeze/archive.c:483
 msgid "Name"
-msgstr "Naam:"
+msgstr "Naam"
 
 #: ../libsqueeze/archive.c:486
 msgid "Mime type"