Again, are you submitting this upstream? Laca
On Wed, 2007-03-07 at 11:45 +0800, Rick Ju wrote: > plain text document attachment (6524856.diff) > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 10778) > +++ ChangeLog (working copy) > @@ -1,3 +1,11 @@ > +2007-03-07 Rick Ju <rick.ju at sun.com> > + * base-specs/gaim-otr.spec: added patch gaim-12-jabber-msg.diff > + * patches/gaim-12-jabber-msg.diff: Added for #6524856 > + > 2007-03-06 Damien Carbery <damien.carbery at sun.com> > > * SUNWgnome-media-apps.spec: Hard code %build_with_gnome_cd to 1 > Index: base-specs/gaim.spec > =================================================================== > --- base-specs/gaim.spec (revision 10778) > +++ base-specs/gaim.spec (working copy) > @@ -42,6 +42,7 @@ > Patch10: gaim-10-return-void.diff > # date:2007-01-25 owner:rickju type:bug > Patch11: gaim-11-static-prpls.diff > +# date:2007-03-07 owner:rickju type:bug buster: 6524856 > URL: http://gaim.sourceforge.net/ > BuildRoot: %{_tmppath}/%{name}-%{version}-build > Docdir: %{_defaultdocdir}/gaim > @@ -87,6 +88,7 @@ > %patch9 -p1 > %patch10 -p1 > %patch11 -p1 > +%patch12 -p1 > > %build > %ifos linux > Index: patches/gaim-12-jabber-msg.diff > =================================================================== > --- patches/gaim-12-jabber-msg.diff (revision 0) > +++ patches/gaim-12-jabber-msg.diff (revision 0) > @@ -0,0 +1,11 @@ > +--- gaim-ori/libgaim/protocols/jabber/jabber-ori.c 2007-03-07 > 12:16:24.828217000 +0800 > ++++ gaim/libgaim/protocols/jabber/jabber.c 2007-03-07 12:16:34.984597000 > +0800 > +@@ -160,6 +160,8 @@ > + static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet) > + { > + char *msg = jabber_parse_error(js, packet); > ++ if (!msg) > ++ return; > + > + gaim_connection_error(js->gc, msg); > + g_free(msg);
