rpms/gnomebaker/devel gnomebaker-0.6.4-nograce.patch, NONE, 1.1 gnomebaker-0.6.4-seldata.patch, NONE, 1.1 gnomebaker.spec, 1.22, 1.23

[Tomas Smetana]

Author: tsmetana

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

Modified Files:
	gnomebaker.spec 
Added Files:
	gnomebaker-0.6.4-nograce.patch gnomebaker-0.6.4-seldata.patch 
Log Message:
* Wed Jan 13 2010 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-8
- fix random crahses caused by mixing g_new() with g_slice_free()


gnomebaker-0.6.4-nograce.patch:
 execfunctions.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnomebaker-0.6.4-nograce.patch ---
diff -up gnomebaker-0.6.4/src/execfunctions.c.nograce gnomebaker-0.6.4/src/execfunctions.c
--- gnomebaker-0.6.4/src/execfunctions.c.nograce	2009-12-26 13:50:06.000000000 +0100
+++ gnomebaker-0.6.4/src/execfunctions.c	2009-12-26 13:50:10.000000000 +0100
@@ -293,7 +293,8 @@ cdrecord_add_common_args(ExecCmd *cmd)
 	if(preferences_get_bool(GB_CDRECORD_FORCE))
 	   exec_cmd_add_arg(cmd, "-force");
 
-	exec_cmd_add_arg(cmd, "gracetime=5");
+	/* tsmetana -- this is useless IMHO */
+	/* exec_cmd_add_arg(cmd, "gracetime=5"); */
 
     const gint speed = preferences_get_int(GB_CDWRITE_SPEED);
     if(speed > 0)

gnomebaker-0.6.4-seldata.patch:
 filebrowser.c |    2 +-
 gnomebaker.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gnomebaker-0.6.4-seldata.patch ---
diff -up gnomebaker-0.6.4/src/filebrowser.c.seldata gnomebaker-0.6.4/src/filebrowser.c
--- gnomebaker-0.6.4/src/filebrowser.c.seldata	2010-01-13 15:22:55.000000000 +0100
+++ gnomebaker-0.6.4/src/filebrowser.c	2010-01-13 15:24:09.000000000 +0100
@@ -866,7 +866,7 @@ filebrowser_get_selection(gboolean from_
     else
         tree = glade_xml_get_widget(gnomebaker_getxml(), widget_browser_filelist);
 
-    GtkSelectionData *selection_data = g_new0(GtkSelectionData, 1);
+    GtkSelectionData *selection_data = g_slice_new0(GtkSelectionData);
     filebrowser_on_drag_data_get(tree, NULL, selection_data, 0, 0, NULL);
     return selection_data;
 }
diff -up gnomebaker-0.6.4/src/gnomebaker.c.seldata gnomebaker-0.6.4/src/gnomebaker.c
--- gnomebaker-0.6.4/src/gnomebaker.c.seldata	2010-01-13 15:23:16.000000000 +0100
+++ gnomebaker-0.6.4/src/gnomebaker.c	2010-01-13 15:24:32.000000000 +0100
@@ -529,7 +529,7 @@ gnomebaker_on_add_files(gpointer widget,
         }
 
         /*gtk_selection_data_set_uris(selection_data, uris);*/
-        selection_data = g_new0(GtkSelectionData, 1);
+        selection_data = g_slice_new0(GtkSelectionData);
         gtk_selection_data_set(selection_data, selection_data->target, 8,
                 (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
         GB_TRACE("gnomebaker_on_add_files - [%s]\n", selection_data->data);
@@ -1073,7 +1073,7 @@ gnomebaker_select_files_or_folders(const
         }
 
         /*gtk_selection_data_set_uris(selection_data, uris);*/
-        selection_data = g_new0(GtkSelectionData, 1);
+        selection_data = g_slice_new0(GtkSelectionData);
         gtk_selection_data_set(selection_data, selection_data->target, 8,
             (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
         GB_TRACE("gnomebaker_select_files_or_folders - [%s]\n", selection_data->data);


Index: gnomebaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnomebaker/devel/gnomebaker.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gnomebaker.spec	13 Aug 2009 08:25:43 -0000	1.22
+++ gnomebaker.spec	13 Jan 2010 15:41:01 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           gnomebaker
 Version:        0.6.4
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        GNOME CD/DVD burner
 
 Group:          Applications/Multimedia
@@ -28,6 +28,8 @@ Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
 Patch0: gnomebaker-0.6.4-mimetype.patch
+Patch1: gnomebaker-0.6.4-nograce.patch
+Patch2: gnomebaker-0.6.4-seldata.patch
 
 %description
 CD/DVD burner designed for the GNOME desktop.
@@ -36,6 +38,8 @@ CD/DVD burner designed for the GNOME des
 %prep
 %setup -q
 %patch0 -p1 -b .mimetype
+%patch1 -p1 -b .nograce
+%patch2 -p1 -b .seldata
 chmod 644 AUTHORS TODO
 
 
@@ -87,6 +91,12 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Jan 13 2010 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-8
+- fix random crahses caused by mixing g_new() with g_slice_free()
+
+* Sat Dec 26 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-7
+- fix #497627 - no grace time => avoid nonprintable chars in the output log
+
 * Thu Aug 13 2009 Tomas Smetana <tsmetana at redhat.com> - 0.6.4-6
 - Shouldn't update the mime database but the desktop database