[Gaim-patches] [ gaim-Patches-1017319 ] Patches for Zephyr

[SourceForge.net <no...@so...>]

Patches item #1017319, was opened at 2004-08-26 21:41
Message generated for change (Settings changed) made by seanegan
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=300235&aid=1017319&group_id=235

Category: None
Group: None
>Status: Closed
>Resolution: Accepted
Priority: 5
Submitted By: Derrick J Brashear (shadow)
Assigned to: Sean Egan (seanegan)
Summary: Patches for Zephyr

Initial Comment:
1) remove a null pointer deref opportunity in ZRecvNot.c
2) set CONFDIR if not set in internal.h (this may be unnecessary)
3) fix poor grammar in zephyr.c
4) make the "typing" pings not be sent for broadcast messages 
(generally not done, and entirely not right as was being done in the 
code) in zephyr.c

----------------------------------------------------------------------

>Comment By: Sean Egan (seanegan)
Date: 2005-03-13 18:31

Message:
Logged In: YES 
user_id=199625

Thanks!

----------------------------------------------------------------------

Comment By: Derrick J Brashear (shadow)
Date: 2004-08-30 02:23

Message:
Logged In: YES 
user_id=2081

Seems like a no-brainer, don't apply them out of order;-)

I'll cvs update and regenerate but it doesn't look like anything in cvs is 
updated yet, at least on the anonymous side, so I can't see what I need 
to diff against.

 

----------------------------------------------------------------------

Comment By: Luke Schierer (lschiere)
Date: 2004-08-29 21:58

Message:
Logged In: YES 
user_id=28833

i'm sorry, i'm making more work for you. applying zepher
patches out of order has broken this again. 

----------------------------------------------------------------------

Comment By: Derrick J Brashear (shadow)
Date: 2004-08-28 01:42

Message:
Logged In: YES 
user_id=2081

This is generated from a snapshot matching what's in the anonymous cvs 
tree right now on the head.

----------------------------------------------------------------------

Comment By: Derrick J Brashear (shadow)
Date: 2004-08-28 01:40

Message:
Logged In: YES 
user_id=2081

I got:

|--- zephyr.c   12 Aug 2004 17:44:10 -0000      1.8
|+++ zephyr.c   27 Aug 2004 01:38:06 -0000
--------------------------
File to patch: gaim/src/protocols/zephyr/zephyr.c
patching file gaim/src/protocols/zephyr/zephyr.c
Hunk #2 succeeded at 1536 (offset 2 lines).

against a fresh CVS checkout. I'll upload a fresh copy of the diff.

----------------------------------------------------------------------

Comment By: Luke Schierer (lschiere)
Date: 2004-08-27 22:27

Message:
Logged In: YES 
user_id=28833

luke@lschiere:~/Documents/gaim/gaim.commit$ patch -p0 -i
../patch/gaim.diff2 
can't find file to patch at input line 8
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: ZRecvNot.c
|===================================================================
|RCS file:
/cvsroot/adium/libgaim/libgaim/src/protocols/zephyr/ZRecvNot.c,v
|retrieving revision 1.2
|diff -u -r1.2 ZRecvNot.c
|--- ZRecvNot.c 26 Apr 2004 20:58:42 -0000      1.2
|+++ ZRecvNot.c 27 Aug 2004 01:38:04 -0000
--------------------------
File to patch: src/protocols/zephyr/ZRecvNot.c
patching file src/protocols/zephyr/ZRecvNot.c
can't find file to patch at input line 25
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: zephyr.c
|===================================================================
|RCS file:
/cvsroot/adium/libgaim/libgaim/src/protocols/zephyr/zephyr.c,v
|retrieving revision 1.8
|diff -u -r1.8 zephyr.c
|--- zephyr.c   12 Aug 2004 17:44:10 -0000      1.8
|+++ zephyr.c   27 Aug 2004 01:38:06 -0000
--------------------------
File to patch: src/protocols/zephyr/zephyr.c
patching file src/protocols/zephyr/zephyr.c
Hunk #1 succeeded at 672 (offset 78 lines).
Hunk #2 FAILED at 1612.
1 out of 2 hunks FAILED -- saving rejects to file
src/protocols/zephyr/zephyr.c.rej
luke@lschiere:~/Documents/gaim/gaim.commit$

----------------------------------------------------------------------

Comment By: Derrick J Brashear (shadow)
Date: 2004-08-26 21:50

Message:
Logged In: YES 
user_id=2081

CONFDIR should be being set by configure, so I removed that

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=300235&aid=1017319&group_id=235