167782 - widget/src/gtk2/nsWindow.cpp needs to recover from nsITimer changes

Status: VERIFIED FIXED

(Core :: XUL, defect)

Description

[Håvard Wigtil]

configured with ./configure --prefix=/gnome2 --enable-default-toolkit=gtk2
--disable-debug --disable-mailnews

Compile fails with this message:
nsWindow.cpp: In method `void nsWindow::OnDragLeaveEvent (GtkWidget *, 
GdkDragContext *, unsigned int, void *)':
nsWindow.cpp:1574: no matching function for call to 
`nsDerivedSafe<nsITimer>::Init (void (&) (nsITimer *, void *), nsWindow 
*const, int)'
../../../dist/include/xpcom/nsITimer.h:168: candidates are: nsresult
nsITimer::Init (nsIObserver *, 
unsigned int, unsigned int)

Comment 1

[John Morrison]

-> blizzard (although this seems like more of a tech support request than an 
actual bug report).

Comment 2

[timeless]

1.38 <[e-mail]> 10 Aug 2002 11:21
1572 blizzard 1.38     NS_ASSERTION(mDragLeaveTimer, "Failed to create drag
leave timer!");

1573                   // fire this baby asafp
1574                   mDragLeaveTimer->Init(DragLeaveTimerCallback, this, 0);

this is a result of Bug 157136 Freeze core component scripting interfaces

this is the general form of the change. If you provide a tinderbox to
MozillaTest or something I can commit patches until it goes green.
-      mTimer->Init(NS_STATIC_CAST(nsITimerCallback*, this),
kScrollPosCheckWait, PR_TRUE, NS_TYPE_REPEATING_SLACK);
+      mTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this),
kScrollPosCheckWait, nsITimer::TYPE_REPEATING_SLACK);

Comment 3

[Doug Turner (:dougt)]

Chris, Sorry I missed that one.  Timeless got the fix right.  

Comment 4

[Alec Flett]

r/sr=alecf

Comment 5

[timeless]

Attachment: suggested patch

note that the checkin appears to have busted a bunch of other things I'll stick
a patch up somewhere for them after I find a good way to figure out which files
were and were not touched (lxr+bonsai correlation...)

Comment 6

[Doug Turner (:dougt)]

Comment on attachment 98646 [details] [diff] [review]
suggested patch

r=dougt
sr=alecf (from above)

Comment 7

[timeless]

checked in

Comment 8

[timeless]

ok, i spent time looking through bonsai/lxr, i believe this really was the only
outlier, sorry for the concern :-)

Comment 9

[Christopher Blizzard (:blizzard)]

This still doesn't build for me.  The callback doesn't match the prototype.

Comment 10

[Doug Turner (:dougt)]

doh!

it should be:  InitWithFuncCallback.  Blizzard, can you verify this?

Comment 11

[Christopher Blizzard (:blizzard)]

Attachment: patch

Comment 12

[Doug Turner (:dougt)]

Comment on attachment 98921 [details] [diff] [review]
patch

r=dougt

Comment 13

[Bolian Yin]

I tried this patch. It makes build ok. 

Comment 14

[Alec Flett]

Comment on attachment 98921 [details] [diff] [review]
patch

sr=alecf

Comment 15

[Christopher Blizzard (:blizzard)]

Checked in.  Thanks, guys!

Comment 16

[timeless]

vrfy fixed per bolian yin
sorry about that, i should have gotten this right...