summaryrefslogtreecommitdiff
blob: a30536c80801cd2565a52d2e3ae21c79cb55b7c4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
===================================================================
RCS file: /cvs/gnome/nautilus-cd-burner/src/make-iso.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- src/make-iso.c	2006/09/29 18:23:54	1.13
+++ src/make-iso.c	2006/10/25 17:03:53	1.13.2.1
@@ -965,11 +965,11 @@
 gboolean
 nautilus_burn_iso_graft_get_info (NautilusBurnIsoGraft *graft,
 				  guint64              *size,
-				  gboolean             *use_joliet,
+				  gboolean             *use_joliet_out,
 				  GError              **error)
 {
 	GPtrArray            *argv;
-	gboolean              _use_joliet;
+	gboolean              use_joliet;
 	char                 *stdout_data;
 	char                 *stderr_data;
 	int                   exit_status;
@@ -978,7 +978,7 @@
 	char                 *filelist;
 	gboolean              result;
 
-	_use_joliet = TRUE;
+	use_joliet = TRUE;
 	argv = NULL;
 	filelist = create_temp_graft_file (graft);
 	iso_size = 0;
@@ -991,7 +991,7 @@
 
 	g_ptr_array_add (argv, "mkisofs");
 	g_ptr_array_add (argv, "-r");
-	if (_use_joliet) {
+	if (use_joliet) {
 		g_ptr_array_add (argv, "-J");
 	}
 	if (ncb_mkisofs_supports_utf8 ()) {
@@ -1062,6 +1062,9 @@
 	if (size != NULL) {
 		*size = iso_size;
 	}
+	if (use_joliet_out != NULL) {
+		*use_joliet_out = use_joliet;
+	}
 
 	return result;
 }