head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.18
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.16
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.14
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.12
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.10
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.8
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.6
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.4
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.2
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.1.0.4
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.2
	pkgsrc-2007Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2008.04.15.18.30.23;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2007.11.03.16.12.48;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 2.22.1.1
This switches to the gnome-2.22 release branch.
@
text
@$NetBSD: patch-ag,v 1.1 2007/11/03 16:12:48 drochner Exp $

--- backend/comics/comics-document.c.orig	2007-09-17 18:19:23.000000000 +0200
+++ backend/comics/comics-document.c
@@@@ -106,7 +106,7 @@@@ comics_document_load (EvDocument *docume
 {
 	ComicsDocument *comics_document = COMICS_DOCUMENT (document);
 	GSList *supported_extensions;
-	gchar *list_files_command = NULL, *stdout, *quoted_file, *mime_type;
+	gchar *list_files_command = NULL, *xstdout, *quoted_file, *mime_type;
 	gchar **cbr_files;
 	gboolean success;
 	int i, retval;
@@@@ -137,7 +137,7 @@@@ comics_document_load (EvDocument *docume
 
 	/* Get list of files in archive */
 	success = g_spawn_command_line_sync (list_files_command,
-					     &stdout, NULL, &retval, error);
+					     &xstdout, NULL, &retval, error);
 	g_free (list_files_command);
 
 	if (!success) {
@@@@ -152,7 +152,7 @@@@ comics_document_load (EvDocument *docume
 		return FALSE;
 	}
 
-	cbr_files = g_strsplit (stdout, "\n", 0);
+	cbr_files = g_strsplit (xstdout, "\n", 0);
 	supported_extensions = get_supported_image_extensions ();
 	for (i = 0; cbr_files[i] != NULL; i++) {
 		gchar *suffix = g_strrstr (cbr_files[i], ".");
@@@@ -173,7 +173,7 @@@@ comics_document_load (EvDocument *docume
 		g_free (suffix);
 	}
 
-	g_free (stdout);
+	g_free (xstdout);
 	g_free (mime_type);
 	g_strfreev (cbr_files);
 	g_slist_foreach (supported_extensions, (GFunc) g_free, NULL);
@


1.1
log
@update to 2.20.1
This switches to the new gnome-2.20 branch.
@
text
@d1 1
a1 1
$NetBSD$
@