[brasero] 2009-05-03 Philippe Rouquier <bonfire-app wanadoo fr>

[Philippe Rouquier <philippr src gnome org>]

commit 95b4ddcec68c57ff5d4021a3088ede3f4c172525
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun May 3 20:56:34 2009 +0200

    2009-05-03  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Fix a problem with nautilus extension being greyed out
    
    	* libbrasero-burn/brasero-burn-options.c
    	(brasero_burn_options_not_ready_dialog_cb):
    	* libbrasero-burn/brasero-track-data-cfg.c
    	(brasero_track_data_cfg_add),
    	(brasero_track_data_cfg_add_empty_directory),
    	(brasero_track_data_cfg_get_status),
    	(brasero_track_data_cfg_activity_changed):
    	* nautilus/nautilus-burn-extension.c
    	(launch_brasero_on_window_session):
---
 ChangeLog                                |   14 ++++++++++++++
 libbrasero-burn/Makefile.am              |    2 +-
 libbrasero-burn/brasero-burn-options.c   |    2 ++
 libbrasero-burn/brasero-track-data-cfg.c |   23 ++++++++++++++++-------
 nautilus/nautilus-burn-extension.c       |    4 +---
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c519c8..85f30db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2009-05-03  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Fix a problem with nautilus extension being greyed out
+
+	* libbrasero-burn/brasero-burn-options.c
+	(brasero_burn_options_not_ready_dialog_cb):
+	* libbrasero-burn/brasero-track-data-cfg.c
+	(brasero_track_data_cfg_add),
+	(brasero_track_data_cfg_add_empty_directory),
+	(brasero_track_data_cfg_get_status),
+	(brasero_track_data_cfg_activity_changed):
+	* nautilus/nautilus-burn-extension.c
+	(launch_brasero_on_window_session):
+
+2009-05-03  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Created a new object BraseroTrackDataCfg and ported nautilus extension to it
 	so that it can behaves as it used to be
 
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 32bfcfc..1795b79 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -187,7 +187,7 @@ libbrasero_burn_la_SOURCES = 		\
 	brasero-track-data-cfg.c                 \
 	brasero-track-data-cfg.h                 \
 	brasero-filtered-uri.c                 \
-	brasero-filtered-uri.h
+	brasero-filtered-uri.h                 
 
 if BUILD_INOTIFY
 libbrasero_burn_la_SOURCES += brasero-file-monitor.c brasero-file-monitor.h
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 5c458a7..607f391 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -271,6 +271,8 @@ brasero_burn_options_not_ready_dialog_cb (gpointer data)
 	if (result != BRASERO_BURN_OK)
 		gtk_dialog_response (GTK_DIALOG (data), GTK_RESPONSE_CANCEL);
 
+	gtk_widget_set_sensitive (GTK_WIDGET (data), TRUE);
+
 	return FALSE;
 }
 
diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index b64e0f0..e6d24a0 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -1572,9 +1572,13 @@ brasero_track_data_cfg_add (BraseroTrackDataCfg *track,
 	if (priv->loading)
 		return FALSE;
 
-	parent_node = brasero_track_data_cfg_path_to_node (track, parent);
-	if (parent_node && (parent_node->is_file || parent_node->is_loading))
-		parent_node = parent_node->parent;
+	if (parent) {
+		parent_node = brasero_track_data_cfg_path_to_node (track, parent);
+		if (parent_node && (parent_node->is_file || parent_node->is_loading))
+			parent_node = parent_node->parent;
+	}
+	else
+		parent_node = brasero_data_project_get_root (BRASERO_DATA_PROJECT (priv->tree));
 
 	return (brasero_data_project_add_loading_node (BRASERO_DATA_PROJECT (BRASERO_DATA_PROJECT (priv->tree)), uri, parent_node) != NULL);
 }
@@ -1595,9 +1599,13 @@ brasero_track_data_cfg_add_empty_directory (BraseroTrackDataCfg *track,
 	if (priv->loading)
 		return NULL;
 
-	parent_node = brasero_track_data_cfg_path_to_node (track, parent);
-	if (parent_node && (parent_node->is_file || parent_node->is_loading))
-		parent_node = parent_node->parent;
+	if (parent) {
+		parent_node = brasero_track_data_cfg_path_to_node (track, parent);
+		if (parent_node && (parent_node->is_file || parent_node->is_loading))
+			parent_node = parent_node->parent;
+	}
+	else
+		parent_node = brasero_data_project_get_root (BRASERO_DATA_PROJECT (priv->tree));
 
 	if (!name) {
 		guint nb = 1;
@@ -1947,7 +1955,6 @@ brasero_track_data_cfg_get_status (BraseroTrack *track,
 	}
 
 	if (priv->load_errors) {
-
 		g_slist_foreach (priv->load_errors, (GFunc) g_free, NULL);
 		g_slist_free (priv->load_errors);
 		priv->load_errors = NULL;
@@ -2220,6 +2227,8 @@ emit_signal:
 		       brasero_track_data_cfg_signals [ACTIVITY],
 		       0,
 		       active);
+
+	brasero_track_changed (BRASERO_TRACK (self));
 }
 
 static void
diff --git a/nautilus/nautilus-burn-extension.c b/nautilus/nautilus-burn-extension.c
index 20b991f..0ae1033 100644
--- a/nautilus/nautilus-burn-extension.c
+++ b/nautilus/nautilus-burn-extension.c
@@ -109,10 +109,8 @@ launch_brasero_on_window_session (BraseroSessionCfg	*session,
 
 	/* run option dialog */
 	dialog = brasero_burn_options_new (session);
-	if (window) {
+	if (window)
 		gtk_window_set_transient_for (GTK_WINDOW (dialog), window);
-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	}
 
 	if (options)
 		brasero_burn_options_add_options (BRASERO_BURN_OPTIONS (dialog), options);