rpms/brasero/devel fix-cd-burner.patch, NONE, 1.1 brasero.spec, 1.79, 1.80

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/brasero/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32575

Modified Files:
	brasero.spec 
Added Files:
	fix-cd-burner.patch 
Log Message:
fix nautilus cd-burner


fix-cd-burner.patch:
 nautilus-burn-extension.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE fix-cd-burner.patch ---
diff -up brasero-2.29.91/nautilus/nautilus-burn-extension.c.fix-cd-burner brasero-2.29.91/nautilus/nautilus-burn-extension.c
--- brasero-2.29.91/nautilus/nautilus-burn-extension.c.fix-cd-burner	2010-02-22 15:37:17.000000000 -0500
+++ brasero-2.29.91/nautilus/nautilus-burn-extension.c	2010-03-03 20:38:00.784400518 -0500
@@ -265,6 +265,8 @@ write_activate (GtkWindow *toplevel)
 	if (nautilus_disc_burn_is_empty (toplevel))
 		return;
 
+        ensure_initialized ();
+
 	track = brasero_track_data_cfg_new ();
 	brasero_track_data_cfg_add (track, BURN_URI, NULL);
 
@@ -433,6 +435,8 @@ check_disc_activate_cb (NautilusMenuItem
 {
 	BraseroSumDialog *dialog;
 
+        ensure_initialized ();
+
 	dialog = brasero_sum_dialog_new ();
 	tool_dialog_run (BRASERO_TOOL_DIALOG (dialog),
 			 GTK_WINDOW (user_data),
@@ -504,7 +508,12 @@ drive_is_cd_device (GDrive *gdrive)
 
         DEBUG_PRINT ("Got device: %s\n", device);
 
-        monitor = brasero_medium_monitor_get_default ();
+       /* FIXME: since we call the monitor, the library should be initialized.
+        * To avoid all the initializing we'll be able to use the new GIO API
+        * (#594649 -  Have a way to detect optical drives) */
+       ensure_initialized();
+
+       monitor = brasero_medium_monitor_get_default ();
         drive = brasero_medium_monitor_get_drive (monitor, device);
         g_object_unref (monitor);
         g_free (device);
@@ -620,8 +629,6 @@ nautilus_disc_burn_get_file_items (Nauti
 		BraseroMedia		 media;
 		BraseroTrackType	*type;
 
-		ensure_initialized();
-
                 device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 		monitor = brasero_medium_monitor_get_default ();
 		bdrive = brasero_medium_monitor_get_drive (monitor, device_path);


Index: brasero.spec
===================================================================
RCS file: /cvs/pkgs/rpms/brasero/devel/brasero.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- brasero.spec	22 Feb 2010 23:55:04 -0000	1.79
+++ brasero.spec	4 Mar 2010 01:54:01 -0000	1.80
@@ -6,13 +6,16 @@
 
 Name:      brasero
 Version:   2.29.91
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/brasero/
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/2.29/%{name}-%{version}.tar.bz2
 
+# upstream fix
+Patch0: fix-cd-burner.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.15.6
@@ -97,6 +100,7 @@ developing brasero applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-cd-burner
 
 %build
 %configure \
@@ -215,6 +219,9 @@ fi
 
 
 %changelog
+* Wed Mar  3 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.91-2
+- Fix a nautilus cd-burner crash
+
 * Mon Feb 22 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.91-1
 - Update to 2.29.91