1145735 - Remove CRH_DIALOG_TREE_VIEW

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Bill McCloskey [inactive unless it's an emergency] (:billm)]

+++ This bug was initially created as a clone of Bug #1145394 +++

This is some code that we apparently don't use any more.

Comment 1

[Mark Banner (:standard8)]

I'm happy to mentor people on this bug. Here's a starting link for the code that needs removing:

https://dxr.mozilla.org/mozilla-central/search?q=CRH_DIALOG_TREE_VIEW&redirect=false

(anything inside & including the ifdefs).

In the xul file, you'll also need to look for elements such as:

    label="&clearTimeDuration.dateColumn;"

You'll need to search for the label inside, and remove that from the appropriate .dtd file.

Also for the .xul file, you'll need to change the license header from c-style comments (# comment) to html style comments (<!-- comment -->).

Finally in browser/base/jar.mn, look for the two files listed that you've been editing, and remove the '*' at the start of those lines (this stops them being preprocessed).

Comment 2

[Federico Padua [:fedepad]]

Attachment: Bug 1145735 - Remove CRH_DIALOG_TREE_VIEW;

This patch removes code marked with #ifdef CRH_DIALOG_TREE_VIEW
since it's not used anymore as described in the bug description.

Review commit: https://reviewboard.mozilla.org/r/122208/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/122208/

Comment 3

[Federico Padua [:fedepad]]

(In reply to Mark Banner (:standard8) from comment #1)
> I'm happy to mentor people on this bug. Here's a starting link for the code
> that needs removing:
> 
> https://dxr.mozilla.org/mozilla-central/
> search?q=CRH_DIALOG_TREE_VIEW&redirect=false
> 
> (anything inside & including the ifdefs).
> 
> In the xul file, you'll also need to look for elements such as:
> 
>     label="&clearTimeDuration.dateColumn;"
> 
> You'll need to search for the label inside, and remove that from the
> appropriate .dtd file.
> 
> Also for the .xul file, you'll need to change the license header from
> c-style comments (# comment) to html style comments (<!-- comment -->).
> 
> Finally in browser/base/jar.mn, look for the two files listed that you've
> been editing, and remove the '*' at the start of those lines (this stops
> them being preprocessed).

I pushed something for review but I'm not 100% sure...

Comment 4

[Mark Banner (:standard8)]

Hi Federico, thank you for taking this bug. I've had a quick glance and it looks about right. I'll have a full look later today.

Comment 5

[Mark Banner (:standard8)]

Comment on attachment 8849447 [details]
Bug 1145735 - Remove CRH_DIALOG_TREE_VIEW;

https://reviewboard.mozilla.org/r/122208/#review124388

This is looking good, there's just one minor change to do, and then it'll be all set to go.

Thanks.

::: browser/base/content/sanitize.xul:4
(Diff revision 1)
>  <?xml version="1.0"?>
>  
> -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
> -# This Source Code Form is subject to the terms of the Mozilla Public
> +<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
> +<!-- This Source Code Form is subject to the terms of the Mozilla Public -->

Can you change the license lines (4 - 6) to be just one set of <!-- to --> ?

Similar to as shown on this page:

https://www.mozilla.org/MPL/headers/

Comment 6

[Federico Padua [:fedepad]]

Comment on attachment 8849447 [details]
Bug 1145735 - Remove CRH_DIALOG_TREE_VIEW;

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/122208/diff/1-2/

Comment 7

[Federico Padua [:fedepad]]

Comment on attachment 8849447 [details]
Bug 1145735 - Remove CRH_DIALOG_TREE_VIEW;

https://reviewboard.mozilla.org/r/122208/#review124388

> Can you change the license lines (4 - 6) to be just one set of <!-- to --> ?
> 
> Similar to as shown on this page:
> 
> https://www.mozilla.org/MPL/headers/

I think I did. I also rebased and squashed the commits. Have a look!

Comment 8

[Mark Banner (:standard8)]

Comment on attachment 8849447 [details]
Bug 1145735 - Remove CRH_DIALOG_TREE_VIEW;

https://reviewboard.mozilla.org/r/122208/#review124402

That is great. Many thanks for fixing this. I'll push it to our integration queue in a moment. Once it then gets merged to the main branch (typically within about 24 hours) the bug will be closed automatically.

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/50e58f2fae0c
Remove CRH_DIALOG_TREE_VIEW; r=standard8

Comment 10

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/50e58f2fae0c