Closed Bug 299458 Opened 19 years ago Closed 18 years ago

Land 0.9.69.x work on trunk

Categories

(Other Applications :: ChatZilla, defect, P1)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: bugzilla-mozilla-20000923, Assigned: bugzilla-mozilla-20000923)

References

Details

Attachments

(24 obsolete files)

Ok, my patch is 130KB. This will NOT be done all at once. I will make small
patches of each bit of the changes - which should all stand alone fine - and get
review + approval for each in turn. If a certain bug fix already has a bug, I
will put the patch there, and make it block this bug.

Eventually, we'll have 0.9.68.x all on trunk. :)
Attachment #188032 - Flags: review?(samuel)
Attached patch Make DCC Internationally-aware (obsolete) — Splinter Review
This one I think will need the prefs from bug 281172 before it will work at
all, so leaving the review for now.
Depends on: 112325
James, you rock for doing this! I hope we'll get in all interesting stuff for
SeaMonkey 1.0!
Well, the next patch should cover all the version stuff. Unfortunately, I've
just leart that ssieb is going away for a while, so getting reviews may be
harder than usual. Still, we'll give it a go!
This does not change the behaviour when nsIXULAppInfo does not exist (that I
know of), but constructs much better strings when it does exist.
Attachment #188044 - Flags: review?(rginda)
OS: Windows Server 2003 → All
Priority: -- → P1
Version: unspecified → Trunk
Comment on attachment 188044 [details] [diff] [review]
[checked-in] Use nsIXULAppInfo for UA string if available

+	 // FIXME: What happens in XULRunner, where we /are/ the app?

I don't think it's an issue. On xulrunner, application.ini specifies the values
for .name and .version, does it not?
Yes, I know that. It's more what happens to the final UA string... it probably
ends up looking like ChatZilla running on *ChatZilla*, not ChatZilla running on
XULRunner as it should do.
Attachment #188137 - Flags: review?(samuel)
Attachment #188032 - Flags: review?(samuel) → review+
Attachment #188137 - Flags: review?(samuel) → review+
Attachment #188032 - Flags: approval1.8b3?
Attachment #188137 - Flags: approval1.8b3?
Attachment #188032 - Flags: approval1.8b3? → approval1.8b3+
Attachment #188137 - Flags: approval1.8b3? → approval1.8b3+
Attachment #188032 - Attachment description: Make DCC faster, and not break for really small files → [checked-in] Make DCC faster, and not break for really small files
Attachment #188032 - Attachment is obsolete: true
Attachment #188137 - Attachment description: Convert RPL_ISUPPORTS cmds to useful data → [checked-in] Convert RPL_ISUPPORTS cmds to useful data
Attachment #188137 - Attachment is obsolete: true
Comment on attachment 188044 [details] [diff] [review]
[checked-in] Use nsIXULAppInfo for UA string if available

looks ok to me, r=rginda
Attachment #188044 - Flags: review?(rginda) → review+
Attachment #188044 - Flags: approval1.8b3?
Comment on attachment 188044 [details] [diff] [review]
[checked-in] Use nsIXULAppInfo for UA string if available

b3 is pretty much gone, I'll approve this for b4 when that opens.
Attachment #188044 - Flags: approval1.8b4?
Attachment #188044 - Flags: approval1.8b3?
Attachment #188044 - Flags: approval1.8b3-
Attachment #188044 - Flags: approval1.8b4? → approval1.8b4+
Attachment #188044 - Attachment description: Use nsIXULAppInfo for UA string if available → [checked-in] Use nsIXULAppInfo for UA string if available
Attachment #188044 - Attachment is obsolete: true
It's typical, really, right after I land the nsIXULAppInfo code into CVS, one
of the properties is renamed! Here's the fix for that, plus some XULRunner
support (though it relies on .ID being right for now).
Attachment #190303 - Flags: review?(samuel)
Attachment #190304 - Flags: review?(rginda)
This patch adds some messages about using /knock (and links to do it for you)
when trying and failing to join +i channels (for +l and +k it only suggests it,
since you can't use knock unless +i is also set, even though /invite works in
all cases).

It also auto-joins a channel when invited, but ONLY if a view already exists
for that channel.
Attachment #190316 - Flags: review?(samuel)
Comment on attachment 190304 [details] [diff] [review]
[checked-in] Make DCC resolve hostnames async

r=rginda
Attachment #190304 - Flags: review?(rginda) → review+
Attachment #190304 - Flags: approval1.8b4?
Attachment #190304 - Flags: approval1.8b4? → approval1.8b4+
Attachment #190303 - Flags: review?(samuel) → review+
Comment on attachment 190316 [details] [diff] [review]
[checked-in] Mention /knock if available when join is blocked, and auto-join invited channels

r=me with the redundant code in my_unknown removed
Attachment #190316 - Flags: review?(samuel) → review+
Attachment #190303 - Flags: approval1.8b4?
Attachment #190316 - Flags: approval1.8b4?
Attachment #190316 - Flags: approval1.8b4? → approval1.8b4+
Attachment #190304 - Attachment description: Make DCC resolve hostnames async → [checked-in] Make DCC resolve hostnames async
Attachment #190304 - Attachment is obsolete: true
Attachment #190303 - Flags: approval1.8b4? → approval1.8b4+
Attachment #190303 - Attachment description: Fix nsIXULAppInfo for trunk changes + XULRunner support → [checked-in] Fix nsIXULAppInfo for trunk changes + XULRunner support
Attachment #190303 - Attachment is obsolete: true
Attachment #190316 - Attachment description: Mention /knock if available when join is blocked, and auto-join invited channels → [checked-in] Mention /knock if available when join is blocked, and auto-join invited channels
Attachment #190316 - Attachment is obsolete: true
Depends on: 304507
Depends on: 143963
Depends on: 131604
Depends on: 304350
Depends on: 305360
This patch hooks the menu manager into the command event so it can properly
process clicks on repeat-generated menu items, so that the handler gets the
right context object (since part of the context will vary by item).
Attachment #196859 - Flags: review?(rginda)
This patch moves the object rehoming right to the top of the 001 handler,
rather than just after auto-perform, to fix problems with auto-perform commands
thinking they are still on the old server.

It also lets the user survive with "/foo bar" in their auto-perform, as well as
the expected and 'correct' "foo bar". This will make lots of people happy. :)
Attachment #196862 - Flags: review?(samuel)
This patch picks out notices that start with "[#channel-name]" and, if the
channel exists (important point), it displays the notice on the channel
mentioned.

The use of this is the standard IRC Services (NickServ, ChanServ, etc.), as the
format described is used by ChanServ for welcome messages. Without this
redirection, if you join multiple channels with welcome messages at once, all
the messages end up on the last (i.e. current active) view.
Attachment #196863 - Flags: review?(rginda)
This patch adds code to install the ChatZilla icons when running in XULRunner.
Support for Firefox is retained, and Mozilla needs no support (its XPInstall is
so much better than the Toolkit one ;) ).
Attachment #196864 - Flags: review?(samuel)
Comment on attachment 196859 [details] [diff] [review]
[checked-in] Update menu manager to work when *clicking* a repeat-generated item

r=rginda
Attachment #196859 - Flags: review?(rginda) → review+
Comment on attachment 196863 [details] [diff] [review]
[checked-in] Redirect channel-aimed notices

r=rginda
Attachment #196863 - Flags: review?(rginda) → review+
This patch makes two changes:
  1. The mainStep loop is now protected from exceptions, meaning it is much
harder to stop the event processing.
  2. The loop checks more often for new messages, but retains the same maximum
throughput to prevent too much flooding (if any messages were processed, the
normal - longer - delay is used, otherwise a much shorter delay is used).
Attachment #196865 - Flags: review?(rginda)
Comment on attachment 196865 [details] [diff] [review]
[checked-in] Make ChatZilla check more frequently for messages

r=rginda
Attachment #196865 - Flags: review?(rginda) → review+
Attachment #196859 - Attachment description: Update menu manager to work when *clicking* a repeat-generated item → [checked-in] Update menu manager to work when *clicking* a repeat-generated item
Attachment #196859 - Attachment is obsolete: true
Attachment #196863 - Attachment description: Redirect channel-aimed notices → [checked-in] Redirect channel-aimed notices
Attachment #196863 - Attachment is obsolete: true
Attachment #196865 - Attachment description: Make ChatZilla check more frequently for messages → [checked-in] Make ChatZilla check more frequently for messages
Attachment #196865 - Attachment is obsolete: true
Attached patch [checked-in] Squash tabs again (obsolete) — Splinter Review
This makes tabs squash on trunk (yet again, damn XUL behaviour changes), fixes
issues with bad focus code in tabbox.xml (setfocus="false" stops the tab code
being lame and focusing itself) and keyboard tab switching (onselect event).
Attachment #197416 - Flags: review?(rginda)
Attachment #196862 - Flags: review?(samuel) → review+
Attachment #196864 - Flags: review?(samuel) → review+
Comment on attachment 197416 [details] [diff] [review]
[checked-in] Squash tabs again

r=rginda
Attachment #197416 - Flags: review?(rginda) → review+
Attachment #196862 - Attachment description: Rehome objects first or there'll be trouble → [checked-in] Rehome objects first or there'll be trouble
Attachment #196862 - Attachment is obsolete: true
Attachment #196864 - Attachment description: Add icon install code for XULRunner → [checked-in] Add icon install code for XULRunner
Attachment #196864 - Attachment is obsolete: true
Attachment #197416 - Attachment description: Squash tabs again → [checked-in] Squash tabs again
Attachment #197416 - Attachment is obsolete: true
Attachment 196864 [details] [diff] is entirely unnecessary and is really not a good idea. If you
package your icon in <extension>/chrome/icons/default it will automatically be
found and used (XULRunner and Firefox 1.5).
bsmedberg, as usual, toolkit provides too little (way) too late.

Even if such a location now works (it didn't used too), it is incompatible with
the Mozilla XPInstall layout, and since we rely on its handling of icon
auto-install, the location is non-negotiable. Also, you seem to forget that
Firefox 1.0 is more important than Firefox <some version not released yet>. Even
once released, FF 1.5 will have no effect on this as FF 1.0 support is not being
dropped.
It is not at all incompatible with the xpinstall layout. It is trivial to write
the install.js instruction to place a file from your archive in whichever
location you want.
Ok, it seems we do install the icons ourselves, sorry, but that doesn't change
the FF 1.0 requirement. Toolkit's XPI new layout just arrived too late. *We*
have to care about backwards compatibility.
Depends on: 313146
Attachment #188033 - Attachment is obsolete: true
Depends on: 296702
Depends on: 313213
Depends on: 313201
Depends on: 40974
Depends on: 313802
Depends on: 278763
Removing dependencies that are not in 0.9.69 and hence shouldn't be blocking this bug.

Updating summary to reflect 0.9.69 release.
No longer depends on: 40974, 112325, 207195
Summary: Land 0.9.68.x work on trunk → Land 0.9.69.x work on trunk
Silver wrote this, seems fine to me. Expect more bugspam as I add more attachments with stuff that went into 0.9.69.x
Attachment #208752 - Flags: review?(samuel)
Style inline buttons more like links, make sure style is correct in type="chrome" Firefox 1.5+
Attachment #208762 - Flags: review?(samuel)
Attached patch [checked in] Small fixes (obsolete) — Splinter Review
Changes the sortResource to work with the unicodeName, add the chatzilla-window id to the pref window (why, James?) and from now on assume that updateUsers *is* smart enough to deal with user nick changes.
Attachment #208842 - Flags: review?(samuel)
Comment on attachment 208842 [details] [diff] [review]
[checked in] Small fixes

To explain this patch:
 - adding the ID to the preferences window will make it pick up the same window icon as the main window, i.e. the cZ logo.
 - the hack for updateUsers not coping was causing CIRCUser object leaks, so don't do it.
 - the nick -> unicodeName change is because the 'nick' RDF property is the one displayed, and thus gets the unknown characters prefixed to it, making it unsuitable for sorting by name (see http://lxr.mozilla.org/seamonkey/source/extensions/irc/xul/content/static.js#4522 and http://lxr.mozilla.org/seamonkey/source/extensions/irc/xul/content/static.js#4555).
This changes the place and way where and in which internal values are determined and used to check which menu items should be displayed. All in all this doesn't change anything on the user end, but it's still useful for the external reorganizations planned (see bug 291105).
Attachment #208846 - Flags: review?(samuel)
Attached patch [checked in] Fixes to utils.js (obsolete) — Splinter Review
This makes formatException a bit more lenient to what it will accept as being exceptions, and makes isinstance actually work properly all the time.
Attachment #208856 - Flags: review?(samuel)
Attached patch Whitespace changes [checked in] (obsolete) — Splinter Review
Wee. Or somesuch. It's best to get this in so we comply with the style guidelines stuck somewhere on Robert Ginda's website, and so that we don't see this back in any future patches - most of our editors automatically remove the whitespace anyway.
This makes for a more welcoming first message when starting ChatZilla, and stops /help from spewing help for *all* the commands CZ knows (sucky!). Useful stuff.
Attachment #208863 - Flags: review?(samuel)
This does lots of stuff to the join dialog code, and the associated code used when getting and saving/loading /list-s. What it actually changes is something that'd probably be better explained by James himself.
Attachment #208867 - Flags: review?(samuel)
Attachment #208762 - Flags: review?(samuel) → review+
Attachment #208842 - Flags: review?(samuel) → review+
Comment on attachment 208846 [details] [diff] [review]
[checked in w/ whitespace change] Reorganize menus.js

+         ["-",                        {visibleif: NotMac}],

whoever checks this patch in, fix this whitespace
Attachment #208846 - Attachment description: Reorganize menus.js → Reorganize menus.js [fix whitespace before checkin]
Attachment #208846 - Flags: review?(samuel) → review+
Attachment #208856 - Flags: review?(samuel) → review+
Attachment #208860 - Flags: review+
Attachment #208863 - Flags: review?(samuel) → review+
Attachment #208869 - Flags: review?(samuel) → review+
Comment on attachment 208752 [details] [diff] [review]
Update warning about the timer bug

the message name should be changed as well
Attachment #208752 - Flags: review?(samuel) → review-
Depends on: 299472
Comment on attachment 208860 [details] [diff] [review]
Whitespace changes [checked in]

Checking in mozilla/extensions/irc/xul/content/static.js;
/cvsroot/mozilla/extensions/irc/xul/content/static.js,v  <--  static.js
new revision: 1.173; previous revision: 1.172
done
Checking in mozilla/extensions/irc/xul/content/handlers.js;
/cvsroot/mozilla/extensions/irc/xul/content/handlers.js,v  <--  handlers.js
new revision: 1.113; previous revision: 1.112
done
Checking in mozilla/extensions/irc/xul/content/prefs.js;
/cvsroot/mozilla/extensions/irc/xul/content/prefs.js,v  <--  prefs.js
new revision: 1.31; previous revision: 1.30
done
Checking in mozilla/extensions/irc/js/lib/utils.js;
/cvsroot/mozilla/extensions/irc/js/lib/utils.js,v  <--  utils.js
new revision: 1.60; previous revision: 1.59
done
Attachment #208860 - Attachment description: Whitespace changes → Whitespace changes [checked in]
Attachment #208860 - Attachment is obsolete: true
Comment on attachment 208863 [details] [diff] [review]
[checked in] Welcome message and help optimizations

Checked in.
Attachment #208863 - Attachment description: Welcome message and help optimizations → [checked in] Welcome message and help optimizations
Attachment #208863 - Attachment is obsolete: true
Comment on attachment 208846 [details] [diff] [review]
[checked in w/ whitespace change] Reorganize menus.js

Checking in mozilla/extensions/irc/xul/content/menus.js;
/cvsroot/mozilla/extensions/irc/xul/content/menus.js,v  <--  menus.js
new revision: 1.21; previous revision: 1.20
done
Attachment #208846 - Attachment description: Reorganize menus.js [fix whitespace before checkin] → [checked in w/ whitespace change] Reorganize menus.js
Attachment #208846 - Attachment is obsolete: true
Attachment #208762 - Attachment description: Inline Buttons and Link Style → [checked in] Inline Buttons and Link Style
Attachment #208762 - Attachment is obsolete: true
Attachment #208842 - Attachment description: Small fixes → [checked in] Small fixes
Attachment #208842 - Attachment is obsolete: true
Attachment #208856 - Attachment description: Fixes to utils.js → [checked in] Fixes to utils.js
Attachment #208856 - Attachment is obsolete: true
Attachment #208869 - Attachment description: Always give the correct log URL when using the /log command to check the URL → [checked in] Always give the correct log URL when using the /log command to check the URL
Attachment #208869 - Attachment is obsolete: true
Comment on attachment 208867 [details] [diff] [review]
Restructure Channel Dialog and /list saving/loading code

potential endless /list loop, unused function, and commented out code
Attachment #208867 - Flags: review?(samuel) → review-
Attachment #208867 - Attachment is obsolete: true
Attachment #209298 - Flags: review?(samuel)
Comment on attachment 209298 [details] [diff] [review]
[checked in] Restructure Channel Dialog and /list saving/loading code (take 2)

>+const STATE_LIST_AND_LOAD = ++s;   // Doing /list and loading simultaniously.
  simultaneously
>+const SUBSTATE_ERROR = ++s;  // Error occured: don't try do to any more.
  occurred: don't try to do any more.
Attachment #209298 - Flags: review?(samuel) → review+
Comment on attachment 209298 [details] [diff] [review]
[checked in] Restructure Channel Dialog and /list saving/loading code (take 2)

Checked in with spelling corrections.
Attachment #209298 - Attachment description: Restructure Channel Dialog and /list saving/loading code (take 2) → [checked in] Restructure Channel Dialog and /list saving/loading code (take 2)
Attachment #209298 - Attachment is obsolete: true
Removing dependency for the instrumentation
No longer depends on: 299472
New patch for the bug warning, simple global replace of the bug #.
Attachment #208752 - Attachment is obsolete: true
Attachment #209359 - Flags: review?(samuel)
Comment on attachment 209359 [details] [diff] [review]
[Checked in] Update warning about timer bug, take 2

The bug description is still from the old one, but it's clearer than the description on the new one.
Attachment #209359 - Flags: review?(samuel) → review+
Comment on attachment 209359 [details] [diff] [review]
[Checked in] Update warning about timer bug, take 2

Now all that's left is versioning differences (and the description in install.rdf).
Attachment #209359 - Attachment description: Update warning about timer bug, take 2 → [Checked in] Update warning about timer bug, take 2
Attachment #209359 - Attachment is obsolete: true
We're done! Finally!

Ahem.

Expect a release of 0.9.70 later tonight or perhaps tomorrow. Off trunk!
Status: NEW → RESOLVED
Closed: 18 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: