rpms/gaim/devel gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch, NONE, 1.1 gaim.spec, 1.160, 1.161

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14313

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch 
Log Message:
Debian patch 12_gstreamer-cleanup, hopefully fixes #218070


gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch:
 gtksound.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch ---
--- gaim-2.0.0+beta5/gtk/gtksound.c.orig	2006-12-05 20:16:59.000000000 -0500
+++ gaim-2.0.0+beta5/gtk/gtksound.c	2006-12-05 20:54:47.000000000 -0500
@@ -394,6 +394,7 @@
 	char *uri;
 	GstElement *sink = NULL;
 	GstElement *play = NULL;
+	GstBus *bus = NULL;
 #endif
 
 	if (gaim_prefs_get_bool("/gaim/gtk/sound/mute"))
@@ -451,21 +452,32 @@
 		sink = gst_element_factory_make("gconfaudiosink", "sink");
 		if (!sink)
 			sink = gst_element_factory_make("autoaudiosink", "sink");
+		if (!sink) {
+			gaim_debug_error("sound", "Unable to create GStreamer audiosink.\n");
+			return;
+		}
 	} else if (!strcmp(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
+		if (!sink) {
+			gaim_debug_error("sound", "Unable to create GStreamer audiosink.\n");
+			return;
+		}
 	}
 
-	uri = g_strdup_printf("file://%s", filename);
 	play = gst_element_factory_make("playbin", "play");
 
+	uri = g_strdup_printf("file://%s", filename);
+
 	g_object_set(G_OBJECT(play), "uri", uri,
 		                     "volume", volume,
 		                     "audio-sink", sink, NULL);
 
-	gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(play)),
-			  bus_call, play);
+	bus = gst_pipeline_get_bus(GST_PIPELINE(play));
+	gst_bus_add_watch(bus, bus_call, play);
+
 	gst_element_set_state(play, GST_STATE_PLAYING);
 
+	gst_object_unref(bus);
 	g_free(uri);
 
 #else /* USE_GSTREAMER */


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- gaim.spec	5 Dec 2006 22:42:29 -0000	1.160
+++ gaim.spec	6 Dec 2006 19:06:27 -0000	1.161
@@ -33,7 +33,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.26.%{betaver}%{?dist}
+Release:	0.27.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -68,6 +68,7 @@
 Patch108: gaim-2.0.0beta5-debian-08_jabber-info-crash.patch
 Patch110: gaim-2.0.0beta5-debian-10_text-arrow-keys.patch
 Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
+Patch112: gaim-2.0.0beta5-debian-12_gstreamer-cleanup.patch
 
 Patch150: gaim-2.0.0beta5-silc-edit-account-crash.patch
 Patch152: gaim-2.0.0beta5-gtk-filename-blanked.patch
@@ -202,6 +203,7 @@
 %patch108 -p1
 %patch110 -p1
 %patch111 -p1
+%patch112 -p1
 
 %patch150 -p1
 %patch152 -p1
@@ -322,14 +324,12 @@
 %doc NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
 %{_bindir}/*
 %{_libdir}/gaim/
-%{_libdir}/libgaim-client.so.*
 %{_libdir}/libgaim.so.*
 %{_libdir}/libgnt.so.*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_datadir}/aclocal/gaim.m4
 %{_datadir}/applications/gaim.desktop
-%{_datadir}/dbus-1/services/gaim.service
 %{_datadir}/pixmaps/gaim/
 %{_datadir}/pixmaps/gaim.png
 %{_datadir}/pixmaps/gaim.svg
@@ -340,19 +340,28 @@
 %{perl_vendorarch}/Gaim*
 %{perl_vendorarch}/auto/Gaim/
 %endif
+%if %{dbus_integration}
+%{_libdir}/libgaim-client.so.*
+%{_datadir}/dbus-1/services/gaim.service
+%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gaim/
 %{_includedir}/gnt/
-%{_libdir}/libgaim-client.so
 %{_libdir}/libgaim.so
 %{_libdir}/libgnt.so
 %{_libdir}/pkgconfig/gaim.pc
 %{_libdir}/pkgconfig/gnt.pc
+%if %{dbus_integration}
+%{_libdir}/libgaim-client.so
+%endif
 
 %changelog
-* Tue Dec 05 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.26.beta6
+* Wed Dec 06 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.27.beta5
+- Debian patch 12_gstreamer-cleanup, hopefully fixes #218070
+
+* Tue Dec 05 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.26.beta5
 - Jabber SASL Authentication Crash (#217335)
 
 * Wed Nov 29 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.25.beta5