rpms/gossip/devel gossip-0.25-pixbuf.patch, NONE, 1.1 gossip.spec, 1.42, 1.43

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/pkgs/rpms/gossip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16346

Modified Files:
	gossip.spec 
Added Files:
	gossip-0.25-pixbuf.patch 
Log Message:
* Tue May 29 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.25-2
- Add patch to fix pixbuf crasher.


gossip-0.25-pixbuf.patch:

--- NEW FILE gossip-0.25-pixbuf.patch ---
--- trunk/libgossip/gossip-avatar.c	2007/05/29 17:43:58	2423
+++ trunk/libgossip/gossip-avatar.c	2007/05/29 22:01:22	2424
@@ -221,6 +221,8 @@
 GdkPixbuf *
 gossip_avatar_get_pixbuf (GossipAvatar *avatar)
 {
+	g_return_val_if_fail (avatar != NULL, NULL);
+
 	if (!avatar->pixbuf) {
 		avatar->pixbuf = avatar_create_pixbuf (avatar, AVATAR_SIZE);
 	}
--- trunk/src/gossip-notify.c	2007/05/29 17:43:58	2423
+++ trunk/src/gossip-notify.c	2007/05/29 22:01:22	2424
@@ -217,7 +217,7 @@
 			       &show_avatars);
 
 	if (show_avatars) {
-		pixbuf = gossip_avatar_get_pixbuf (gossip_contact_get_avatar (contact));
+		pixbuf = gossip_contact_get_avatar_pixbuf (contact);
 	}
 
 	if (pixbuf) {
@@ -322,7 +322,7 @@
 			      &show_avatars);
 
 	if (show_avatars) {
-		pixbuf = gossip_avatar_get_pixbuf (gossip_contact_get_avatar (contact));
+		pixbuf = gossip_contact_get_avatar_pixbuf (contact);
 	}
 
 	if (pixbuf) {


Index: gossip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gossip/devel/gossip.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gossip.spec	29 May 2007 17:35:24 -0000	1.42
+++ gossip.spec	29 May 2007 23:29:45 -0000	1.43
@@ -2,13 +2,14 @@
 
 Name:           gossip
 Version:        0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME Jabber Client
 
 Group:          Applications/Communications
 License:        GPL
 URL:		http://www.imendio.com/projects/gossip/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-%{version}-pixbuf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -46,6 +47,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .pixbuf
 
 
 %build
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Tue May 29 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.25-2
+- Add patch to fix pixbuf crasher.
+
 * Tue May 29 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.25-1
 - Update to 0.25.