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

Stephan Arts stephan at xfce.org
Mon Feb 12 01:04:30 CET 2007


Author: stephan
Date: 2007-02-12 00:04:30 +0000 (Mon, 12 Feb 2007)
New Revision: 24951

Modified:
   squeeze/trunk/libsqueeze/internals.c
Log:
removed obsolete functions

Modified: squeeze/trunk/libsqueeze/internals.c
===================================================================
--- squeeze/trunk/libsqueeze/internals.c	2007-02-12 00:01:46 UTC (rev 24950)
+++ squeeze/trunk/libsqueeze/internals.c	2007-02-12 00:04:30 UTC (rev 24951)
@@ -39,106 +39,6 @@
 static gint
 lsq_opened_archives_lookup_archive(gconstpointer open_archive, gconstpointer path);
 
-/*
-void
-lsq_default_child_watch_func(GPid pid, gint status, gpointer data)
-{
-	LSQArchive *archive = data;
-	archive->child_pid = 0;
-	if(archive->old_status == LSQ_ARCHIVESTATUS_REFRESH && archive->status == LSQ_ARCHIVESTATUS_USERBREAK)
-		g_object_unref(archive);
-	else
-	{
-		g_spawn_close_pid(pid);
-		if(WIFEXITED(status))
-		{
-			if(WEXITSTATUS(status))
-			{
-				lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_ERROR);
-			}
-			else
-			{
-				if(archive->status == LSQ_ARCHIVESTATUS_ADD)
-				{
-					if(!archive->file_info)
-					{
-						archive->file_info = thunar_vfs_info_new_for_path(archive->path_info, NULL);
-						if(archive->file_info)
-						{
-							thunar_vfs_mime_info_unref(archive->mime_info);
-							archive->mime_info = archive->file_info->mime_info;
-							thunar_vfs_mime_info_ref(archive->mime_info);
-						}
-					}
-				}
-				if(archive->status != LSQ_ARCHIVESTATUS_REFRESH)
-					lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_IDLE);
-			}
-		}
-		else
-			lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_IDLE);
-	}
-}
-
-gint
-lsq_execute(gchar *command, LSQArchive *archive, GChildWatchFunc function, GIOFunc f_in, GIOFunc f_out, GIOFunc f_err)
-{
-	gchar **argvp;
-	gint argcp;
-	gint fd_in, fd_out, fd_err;
-	if (archive->child_pid)
-		return 1;
-
-#ifdef DEBUG
-	g_debug("Executing '%s'", command);
-#endif
-	g_shell_parse_argv(command, &argcp, &argvp, NULL);
-	if ( ! g_spawn_async_with_pipes (
-			NULL,
-			argvp,
-			NULL,
-			G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
-			NULL,
-			NULL,
-			&(archive->child_pid),
-			&fd_in,
-			&fd_out,
-			&fd_err,
-			NULL) )
-		return 1;
-	if(function)
-	{
-		g_child_watch_add(archive->child_pid, function, archive);
-	}
-	else
-	{
-		g_child_watch_add(archive->child_pid, lsq_default_child_watch_func, archive);
-	}
-	if(f_in)
-	{
-		archive->ioc_in = g_io_channel_unix_new(fd_in);
-		g_io_channel_set_encoding (archive->ioc_in, "ISO8859-1" , NULL);
-		g_io_channel_set_flags ( archive->ioc_in, G_IO_FLAG_NONBLOCK , NULL );
-		g_io_add_watch (archive->ioc_in, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, f_in, archive);
-	}
-	if(f_out)
-	{
-		archive->ioc_out = g_io_channel_unix_new(fd_out);
-		g_io_channel_set_encoding (archive->ioc_out, NULL, NULL);
-		g_io_channel_set_flags (archive->ioc_out , G_IO_FLAG_NONBLOCK , NULL );
-		g_io_add_watch (archive->ioc_out, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, f_out, archive);
-	}
-	if(f_err)
-	{
-		archive->ioc_err = g_io_channel_unix_new(fd_out);
-//  g_io_channel_set_encoding (ioc_err, "ISO8859-1" , NULL);
-		g_io_channel_set_flags (archive->ioc_err , G_IO_FLAG_NONBLOCK , NULL );
-		g_io_add_watch (archive->ioc_err, G_IO_IN|G_IO_PRI|G_IO_NVAL, f_err, archive);
-	}
-	return 0;
-}
-*/
-
 gchar *
 lsq_concat_filenames(GSList *filenames)
 {



More information about the Xfce4-commits mailing list