rpms/xmms-flac/devel flac-1.1.2-xmms.patch, 1.1, 1.2 xmms-flac.spec, 1.3, 1.4

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/xmms-flac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6293/devel

Modified Files:
	flac-1.1.2-xmms.patch xmms-flac.spec 
Log Message:
Fix config dialog crashes (#173723).


flac-1.1.2-xmms.patch:

Index: flac-1.1.2-xmms.patch
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/flac-1.1.2-xmms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flac-1.1.2-xmms.patch	19 May 2005 09:31:53 -0000	1.1
+++ flac-1.1.2-xmms.patch	22 Nov 2005 11:31:29 -0000	1.2
@@ -1,11 +1,58 @@
---- flac-1.1.2.orig/src/plugin_xmms/configure.c 2005-01-25 07:26:29 +0300
-+++ flac-1.1.2/src/plugin_xmms/configure.c      2005-02-24 12:40:37 +0300
-@@ -61,7 +61,7 @@
-		"", /* proxy_user */
-		"", /* proxy_pass */
-		FALSE, /* save_http_stream */
+diff -uNr flac-1.1.2/src/plugin_xmms/configure.c flac-1.1.2.fixed/src/plugin_xmms/configure.c
+--- flac-1.1.2/src/plugin_xmms/configure.c	2005-01-25 05:26:29.000000000 +0100
++++ flac-1.1.2.fixed/src/plugin_xmms/configure.c	2005-11-10 20:32:57.000000000 +0100
+@@ -55,13 +55,13 @@
+ 		100 /* KB */, /* http_buffer_size */
+ 		50, /* http_prebuffer */
+ 		FALSE, /* use_proxy */
+-		"", /* proxy_host */
++		NULL, /* proxy_host */
+ 		0, /* proxy_port */
+ 		FALSE, /* proxy_use_auth */
+-		"", /* proxy_user */
+-		"", /* proxy_pass */
++		NULL, /* proxy_user */
++		NULL, /* proxy_pass */
+ 		FALSE, /* save_http_stream */
 -		"", /* save_http_path */
-+		FALSE, /* save_http_path */
-		FALSE, /* cast_title_streaming */
-		FALSE /* use_udp_channel */
-	},
++		NULL, /* save_http_path */
+ 		FALSE, /* cast_title_streaming */
+ 		FALSE /* use_udp_channel */
+ 	},
+@@ -159,7 +159,8 @@
+ 	flac_cfg.stream.http_prebuffer = (gint) GTK_ADJUSTMENT(streaming_pre_adj)->value;
+ 
+ 	flac_cfg.stream.use_proxy = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(streaming_proxy_use));
+-	g_free(flac_cfg.stream.proxy_host);
++	if(flac_cfg.stream.proxy_host)
++		g_free(flac_cfg.stream.proxy_host);
+ 	flac_cfg.stream.proxy_host = g_strdup(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_host_entry)));
+ 	flac_cfg.stream.proxy_port = atoi(gtk_entry_get_text(GTK_ENTRY(streaming_proxy_port_entry)));
+ 
+@@ -380,7 +381,7 @@
+ 	GtkWidget *streaming_size_box, *streaming_size_label, *streaming_size_spin;
+ 	GtkWidget *streaming_pre_box, *streaming_pre_label, *streaming_pre_spin;
+ 	GtkWidget *streaming_proxy_frame, *streaming_proxy_vbox;
+-	GtkWidget *streaming_proxy_port_label, 	*streaming_proxy_host_label;
++	GtkWidget *streaming_proxy_port_label, *streaming_proxy_host_label;
+ 	GtkWidget *streaming_save_frame, *streaming_save_vbox;
+ 	GtkWidget *streaming_save_label, *streaming_save_browse;
+ #ifdef FLAC_ICECAST
+@@ -666,7 +667,7 @@
+ 	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_label, FALSE, FALSE, 0);
+ 
+ 	streaming_proxy_host_entry = gtk_entry_new();
+-	gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host);
++	gtk_entry_set_text(GTK_ENTRY(streaming_proxy_host_entry), flac_cfg.stream.proxy_host? flac_cfg.stream.proxy_host : "");
+ 	gtk_box_pack_start(GTK_BOX(streaming_proxy_hbox), streaming_proxy_host_entry, TRUE, TRUE, 0);
+ 
+ 	streaming_proxy_port_label = gtk_label_new(_("Port:"));
+@@ -731,7 +732,7 @@
+ 	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_label, FALSE, FALSE, 0);
+ 
+ 	streaming_save_entry = gtk_entry_new();
+-	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path);
++	gtk_entry_set_text(GTK_ENTRY(streaming_save_entry), flac_cfg.stream.save_http_path? flac_cfg.stream.save_http_path : "");
+ 	gtk_box_pack_start(GTK_BOX(streaming_save_hbox), streaming_save_entry, TRUE, TRUE, 0);
+ 
+ 	streaming_save_browse = gtk_button_new_with_label(_("Browse"));


Index: xmms-flac.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-flac/devel/xmms-flac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms-flac.spec	28 May 2005 12:32:02 -0000	1.3
+++ xmms-flac.spec	22 Nov 2005 11:31:29 -0000	1.4
@@ -3,7 +3,7 @@
 Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files
 Name: xmms-flac
 Version: 1.1.2
-Release: 24
+Release: 25%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://flac.sourceforge.net/
@@ -49,6 +49,10 @@
 
 
 %changelog
+* Tue Nov 22 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-25
+- Update patch with one provided from FLAC CVS by Øyvind Stegard to further
+  fix configuration dialog crashes (#173723).
+
 * Sat May 28 2005 Matthias Saou <http://freshrpms.net/> 1.1.2-24
 - Bump release to 24 since main Core flac obsoletes xmms-flac < 1.1.2-24.
 - Add patches from FC flac to fix libtool issues on x86_64.