[brasero] Fix #585481 – Deep hierarchy warning
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Subject: [brasero] Fix #585481 – Deep hierarchy warning
- Date: Sun, 28 Jun 2009 13:50:15 +0000 (UTC)
commit 51c1a7d169a88218492220d67620bc008053e66b
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Sun Jun 28 15:10:58 2009 +0200
Fix #585481 â?? Deep hierarchy warning
src/brasero-data-disc.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 9344af2..09f65ce 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -92,6 +92,11 @@ struct _BraseroDataDiscPrivate
guint overburning:1;
guint loading:1;
+
+ guint accept_2G_files:1;
+ guint reject_2G_files:1;
+ guint accept_deep_files:1;
+ guint reject_deep_files:1;
};
#define BRASERO_DATA_DISC_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_DATA_DISC, BraseroDataDiscPrivate))
@@ -794,6 +799,12 @@ brasero_data_disc_2G_file_cb (BraseroTrackDataCfg *project,
priv = BRASERO_DATA_DISC_PRIVATE (self);
+ if (priv->accept_deep_files)
+ return TRUE;
+
+ if (priv->reject_deep_files)
+ return FALSE;
+
string = g_strdup_printf (_("Do you really want to add \"%s\" to the selection and use the third version of ISO9660 standard to support it?"), name);
dialog = brasero_app_dialog (brasero_app_get_default (),
string,
@@ -806,13 +817,18 @@ brasero_data_disc_2G_file_cb (BraseroTrackDataCfg *project,
"\nIt is recommended to use the third version of ISO9660 standard which is supported by most of the operating systems including Linux and all versions of Windows ©."
"\nHowever MacOS X cannot read images created with version 3 of ISO9660 standard."));
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Ne_ver Add Such File"), GTK_RESPONSE_REJECT);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add File"), GTK_RESPONSE_YES);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Al_ways Add Such File"), GTK_RESPONSE_ACCEPT);
gtk_widget_show_all (dialog);
answer = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
+ priv->accept_deep_files = (answer == GTK_RESPONSE_ACCEPT);
+ priv->reject_deep_files = (answer == GTK_RESPONSE_REJECT);
+
return (answer != GTK_RESPONSE_YES);
}
@@ -828,6 +844,12 @@ brasero_data_disc_deep_directory_cb (BraseroTrackDataCfg *project,
priv = BRASERO_DATA_DISC_PRIVATE (self);
+ if (priv->accept_2G_files)
+ return TRUE;
+
+ if (priv->reject_2G_files)
+ return FALSE;
+
string = g_strdup_printf (_("Do you really want to add \"%s\" to the selection?"), name);
dialog = brasero_app_dialog (brasero_app_get_default (),
string,
@@ -840,14 +862,19 @@ brasero_data_disc_deep_directory_cb (BraseroTrackDataCfg *project,
"\nBrasero can create an image of such a file hierarchy and burn it; but the disc may not be readable on all operating systems."
"\nNOTE: Such a file hierarchy is known to work on linux."));
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Ne_ver Add Such File"), GTK_RESPONSE_REJECT);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Add File"), GTK_RESPONSE_YES);
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Al_ways Add Such File"), GTK_RESPONSE_ACCEPT);
gtk_widget_show_all (dialog);
answer = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- return (answer != GTK_RESPONSE_YES);
+ priv->accept_2G_files = (answer == GTK_RESPONSE_ACCEPT);
+ priv->reject_2G_files = (answer == GTK_RESPONSE_REJECT);
+
+ return (answer != GTK_RESPONSE_YES && answer != GTK_RESPONSE_ACCEPT);
}
static gboolean
@@ -1107,6 +1134,11 @@ brasero_data_disc_clear (BraseroDisc *disc)
priv = BRASERO_DATA_DISC_PRIVATE (disc);
+ priv->accept_deep_files = FALSE;
+ priv->reject_deep_files = FALSE;
+ priv->accept_2G_files = FALSE;
+ priv->reject_2G_files = FALSE;
+
if (priv->size_changed_id) {
g_source_remove (priv->size_changed_id);
priv->size_changed_id = 0;
@@ -1379,6 +1411,11 @@ brasero_data_disc_unset_track (BraseroDataDisc *disc)
if (!priv->project)
return;
+ priv->accept_deep_files = FALSE;
+ priv->reject_deep_files = FALSE;
+ priv->accept_2G_files = FALSE;
+ priv->reject_2G_files = FALSE;
+
/* Remove filtered files widget */
if (priv->filter) {
gtk_widget_destroy (priv->filter);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]