changeset 2516:a2b862cb4269 trunk

[svn] - avoid double free while playing cdda.
author yaz
date Wed, 14 Feb 2007 06:42:50 -0800
parents 319b10203d7c
children 5fea66ad690c
files ChangeLog src/audacious/build_stamp.c src/audacious/ui_fileinfopopup.c
diffstat 3 files changed, 18 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 13 13:22:51 2007 -0800
+++ b/ChangeLog	Wed Feb 14 06:42:50 2007 -0800
@@ -1,3 +1,14 @@
+2007-02-13 21:22:51 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [4040]
+  gtk_window_set_wmclass() has to be called before gtk_widget_realize(). Patched by Christian "Joker" Birchinger from Gentoo.
+  trunk/src/audacious/ui_equalizer.c      |    3 +--
+  trunk/src/audacious/ui_main.c           |    3 +--
+  trunk/src/audacious/ui_playlist.c       |    3 +--
+  trunk/src/audacious/ui_skinned_window.c |    5 ++++-
+  trunk/src/audacious/ui_skinned_window.h |    2 +-
+  5 files changed, 8 insertions(+), 8 deletions(-)
+
+
 2007-02-13 14:09:50 +0000  Michael Farber <01mf02@gmail.com>
   revision [4038]
   - removed unused function bmp_menu_translate()
--- a/src/audacious/build_stamp.c	Tue Feb 13 13:22:51 2007 -0800
+++ b/src/audacious/build_stamp.c	Wed Feb 14 06:42:50 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070213-4038";
+const gchar *svn_stamp = "20070213-4040";
--- a/src/audacious/ui_fileinfopopup.c	Tue Feb 13 13:22:51 2007 -0800
+++ b/src/audacious/ui_fileinfopopup.c	Wed Feb 14 06:42:50 2007 -0800
@@ -379,8 +379,12 @@
 	if (tuple == NULL)
 		return;
 
-	if ( g_object_get_data( G_OBJECT(filepopup_win) , "file" ) != NULL )
-	  g_free( g_object_get_data( G_OBJECT(filepopup_win) , "file" ) );
+	tmp = g_object_get_data( G_OBJECT(filepopup_win) , "file" );
+	if ( tmp != NULL ) {
+		g_free( tmp );
+		tmp = NULL;
+		g_object_set_data( G_OBJECT(filepopup_win) , "file" , NULL );
+	}
 	if ( ( tuple->file_path ) && ( tuple->file_name ) )
 	{
 		g_object_set_data( G_OBJECT(filepopup_win) , "file" ,