rpms/pidgin/devel pidgin-2.6.0devel-nocamera-crash.patch, NONE, 1.1 pidgin.spec, 1.81, 1.82

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.6.0devel-nocamera-crash.patch 
Log Message:
prevent crash with no camera when closing vv window


pidgin-2.6.0devel-nocamera-crash.patch:
 mediamanager.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pidgin-2.6.0devel-nocamera-crash.patch ---
--- libpurple/mediamanager.c	2fafe3d7f9ea11fc9275a9114cbba9d93576c9bf
+++ libpurple/mediamanager.c	1d55fd9e6e4068c2343d62595b03f26663215867
@@ -780,7 +780,8 @@ purple_media_manager_remove_output_windo
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
-		gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
+		if (peer != NULL)
+			gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- pidgin.spec	21 Jul 2009 21:04:51 -0000	1.81
+++ pidgin.spec	22 Jul 2009 03:07:24 -0000	1.82
@@ -77,7 +77,7 @@
 Name:		pidgin
 Version:	2.6.0
 %define snapshot 20090721
-Release:	0.1.%{snapshot}%{?dist}
+Release:	0.3.%{snapshot}%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -112,6 +112,7 @@ Patch0: pidgin-NOT-UPSTREAM-2.6.0-reread
 Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
+Patch100: pidgin-2.6.0devel-nocamera-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -366,6 +367,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %endif
 
 ## Patches 100+: To be Included in Future Upstream
+%patch100 -p0
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -597,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.3.20090721
+- prevent crash with no camera when closing vv window
+
 * Tue Jul 21 2009 Warren Togami <wtogami at redhat.com> 2.6.0-0.1.20090721
 - 2.6.0 snapshot with voice and video support via farsight2