Attachment 153724 Details for Bug 234399 – Patch v1

[patch] Patch v1

p-fc6-234399 (text/plain), 2.22 KB, created by Kai Engert (:kaie) (inactive account) on 2007-04-29 03:33:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Engert (:kaie) (inactive account)

Created: 2007-04-29 03:33:36 UTC

Size: 2.22 KB

patch

obsolete

>? gaim-2.0.0-0.32.beta6.fc6.src.rpm
>? gaim-2.0.0beta6
>? i386
>Index: gaim-2.0.0beta6-fix-234399
>===================================================================
>RCS file: gaim-2.0.0beta6-fix-234399
>diff -N gaim-2.0.0beta6-fix-234399
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ gaim-2.0.0beta6-fix-234399	29 Apr 2007 03:29:50 -0000
>@@ -0,0 +1,12 @@
>+--- ./gtk/gtkstatusbox.c.pre234399	2007-01-19 05:28:04.000000000 +0100
>++++ ./gtk/gtkstatusbox.c	2007-04-29 04:51:24.000000000 +0200
>+@@ -2119,7 +2119,8 @@
>+ 							GaimSavedStatusSub *sub = gaim_savedstatus_get_substatus(ss, acct);
>+ 							if (sub) {
>+ 								const GaimStatusType *sub_type = gaim_savedstatus_substatus_get_type(sub);
>+-								if (!strcmp(gaim_status_type_get_id(sub_type),
>++								const char *stid = gaim_status_type_get_id(sub_type);
>++								if (stid && !strcmp(stid,
>+ 										gaim_status_type_get_id(acct_status_type)))
>+ 									found = TRUE;
>+ 							}
>Index: gaim.spec
>===================================================================
>RCS file: /cvs/dist/rpms/gaim/FC-6/gaim.spec,v
>retrieving revision 1.151
>diff -u -r1.151 gaim.spec
>--- gaim.spec	23 Mar 2007 19:42:36 -0000	1.151
>+++ gaim.spec	29 Apr 2007 03:29:50 -0000
>@@ -33,7 +33,7 @@
> 
> Name:		gaim
> Version:	2.0.0
>-Release:	0.31.%{betaver}%{?dist}
>+Release:	0.32.%{betaver}%{?dist}
> License:	GPL
> Group:		Applications/Internet
> URL:		http://gaim.sourceforge.net/
>@@ -63,6 +63,7 @@
> ## Patches 100+: To be Included in Future Upstream
> Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
> Patch112: gaim-2.0.0beta6-fix-buggy-fetch-url.diff
>+Patch113: gaim-2.0.0beta6-fix-234399
> 
> BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> Summary:	A Gtk+ based multiprotocol instant messaging client
>@@ -189,6 +190,7 @@
> ## Patches 100+: To be Included in Future Upstream
> %patch111 -p1
> %patch112 -p0
>+%patch113 -p0
> 
> # Relabel internal version for support purposes
> sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
>@@ -339,6 +341,9 @@
> %endif
> 
> %changelog
>+* Sun Apr 29 2007 Kai Engert <kengert@redhat.com> - 2:2.0.0.0-0.32.beta6
>+- Fix crash bug 234399
>+
> * Fri Mar 23 2007 Warren Togami <wtogami@redhat.com> - 2:2.0.0-0.31.beta6
> - Removed debian-02_gnthistory-in-gtk
>   Removed debian-03_gconf-gstreamer.patch

Actions: View | Diff

Attachments on bug 234399: 151945 | 151946 | 153724